get application to compile temporarily

This commit is contained in:
PancakeTAS 2025-07-01 03:19:01 +02:00
parent 3a7864ee19
commit bd759399d4
No known key found for this signature in database
2 changed files with 85 additions and 85 deletions

View file

@ -9,90 +9,90 @@ Generator::Generator(const Context& context) {
// TODO: temporal frames // TODO: temporal frames
// create shader chains // create shader chains
this->downsampleChain = Shaderchains::Downsample(context.device, context.descPool, // this->downsampleChain = Shaderchains::Downsample(context.device, context.descPool,
this->fullFrame0, this->fullFrame1); // this->fullFrame0, this->fullFrame1);
for (size_t i = 0; i < 7; i++) // for (size_t i = 0; i < 7; i++)
this->alphaChains.at(i) = Shaderchains::Alpha(context.device, context.descPool, // this->alphaChains.at(i) = Shaderchains::Alpha(context.device, context.descPool,
this->downsampleChain.getOutImages().at(i), i == 0); // this->downsampleChain.getOutImages().at(i), i == 0);
this->betaChain = Shaderchains::Beta(context.device, context.descPool, // this->betaChain = Shaderchains::Beta(context.device, context.descPool,
this->alphaChains.at(0).getOutImages0(), // this->alphaChains.at(0).getOutImages0(),
this->alphaChains.at(0).getOutImages1(), // this->alphaChains.at(0).getOutImages1(),
this->alphaChains.at(0).getOutImages2()); // this->alphaChains.at(0).getOutImages2());
for (size_t i = 0; i < 7; i++) { // for (size_t i = 0; i < 7; i++) {
if (i < 4) { // if (i < 4) {
this->gammaChains.at(i) = Shaderchains::Gamma(context.device, context.descPool, // this->gammaChains.at(i) = Shaderchains::Gamma(context.device, context.descPool,
this->alphaChains.at(6 - i).getOutImages1(), // this->alphaChains.at(6 - i).getOutImages1(),
this->alphaChains.at(6 - i).getOutImages0(), // this->alphaChains.at(6 - i).getOutImages0(),
this->betaChain.getOutImages().at(std::min(5UL, 6 - i)), // this->betaChain.getOutImages().at(std::min(5UL, 6 - i)),
i == 0 ? std::nullopt // i == 0 ? std::nullopt
: std::optional{this->gammaChains.at(i - 1).getOutImage2()}, // : std::optional{this->gammaChains.at(i - 1).getOutImage2()},
i == 0 ? std::nullopt // i == 0 ? std::nullopt
: std::optional{this->gammaChains.at(i - 1).getOutImage1()}, // : std::optional{this->gammaChains.at(i - 1).getOutImage1()},
this->alphaChains.at(6 - i - 1).getOutImages0().at(0).getExtent() // this->alphaChains.at(6 - i - 1).getOutImages0().at(0).getExtent()
); // );
} else { // } else {
// this->magicChains.at(i - 4) = Shaderchains::Magic(context.device, context.descPool, // // this->magicChains.at(i - 4) = Shaderchains::Magic(context.device, context.descPool,
// this->alphaChains.at(6 - i).getOutImages(), // // this->alphaChains.at(6 - i).getOutImages(),
// i == 4 ? this->gammaChains.at(i - 1).getOutImage2() // // i == 4 ? this->gammaChains.at(i - 1).getOutImage2()
// : this->extractChains.at(i - 5).getOutImage(), // // : this->extractChains.at(i - 5).getOutImage(),
// i == 4 ? this->gammaChains.at(i - 1).getOutImage1() // // i == 4 ? this->gammaChains.at(i - 1).getOutImage1()
// : this->zetaChains.at(i - 5).getOutImage(), // // : this->zetaChains.at(i - 5).getOutImage(),
// i == 4 ? std::nullopt : std::optional{this->epsilonChains.at(i - 5).getOutImage()} // // i == 4 ? std::nullopt : std::optional{this->epsilonChains.at(i - 5).getOutImage()}
// ); // // );
this->deltaChains.at(i - 4) = Shaderchains::Delta(context.device, context.descPool, // this->deltaChains.at(i - 4) = Shaderchains::Delta(context.device, context.descPool,
this->magicChains.at(i - 4).getOutImages1(), // this->magicChains.at(i - 4).getOutImages1(),
i == 4 ? std::nullopt // i == 4 ? std::nullopt
: std::optional{this->deltaChains.at(i - 5).getOutImage()} // : std::optional{this->deltaChains.at(i - 5).getOutImage()}
); // );
this->epsilonChains.at(i - 4) = Shaderchains::Epsilon(context.device, context.descPool, // this->epsilonChains.at(i - 4) = Shaderchains::Epsilon(context.device, context.descPool,
this->magicChains.at(i - 4).getOutImages2(), // this->magicChains.at(i - 4).getOutImages2(),
this->betaChain.getOutImages().at(6 - i), // this->betaChain.getOutImages().at(6 - i),
i == 4 ? std::nullopt // i == 4 ? std::nullopt
: std::optional{this->epsilonChains.at(i - 5).getOutImage()} // : std::optional{this->epsilonChains.at(i - 5).getOutImage()}
); // );
this->zetaChains.at(i - 4) = Shaderchains::Zeta(context.device, context.descPool, // this->zetaChains.at(i - 4) = Shaderchains::Zeta(context.device, context.descPool,
this->magicChains.at(i - 4).getOutImages3(), // this->magicChains.at(i - 4).getOutImages3(),
i == 4 ? this->gammaChains.at(i - 1).getOutImage1() // i == 4 ? this->gammaChains.at(i - 1).getOutImage1()
: this->zetaChains.at(i - 5).getOutImage(), // : this->zetaChains.at(i - 5).getOutImage(),
this->betaChain.getOutImages().at(6 - i) // this->betaChain.getOutImages().at(6 - i)
); // );
if (i >= 6) // if (i >= 6)
continue; // no extract for i >= 6 // continue; // no extract for i >= 6
this->extractChains.at(i - 4) = Shaderchains::Extract(context.device, context.descPool, // this->extractChains.at(i - 4) = Shaderchains::Extract(context.device, context.descPool,
this->zetaChains.at(i - 4).getOutImage(), // this->zetaChains.at(i - 4).getOutImage(),
this->epsilonChains.at(i - 4).getOutImage(), // this->epsilonChains.at(i - 4).getOutImage(),
this->extractChains.at(i - 5).getOutImage().getExtent() // this->extractChains.at(i - 5).getOutImage().getExtent()
); // );
} // }
} // }
this->mergeChain = Shaderchains::Merge(context.device, context.descPool, // this->mergeChain = Shaderchains::Merge(context.device, context.descPool,
this->fullFrame0, // this->fullFrame0,
this->fullFrame1, // this->fullFrame1,
this->zetaChains.at(2).getOutImage(), // this->zetaChains.at(2).getOutImage(),
this->epsilonChains.at(2).getOutImage(), // this->epsilonChains.at(2).getOutImage(),
this->deltaChains.at(2).getOutImage() // this->deltaChains.at(2).getOutImage()
); // );
} }
void Generator::present(const Context& context) { void Generator::present(const Context& context) {
Core::CommandBuffer cmdBuffer(context.device, context.cmdPool); Core::CommandBuffer cmdBuffer(context.device, context.cmdPool);
cmdBuffer.begin(); cmdBuffer.begin();
this->downsampleChain.Dispatch(cmdBuffer, fc); // this->downsampleChain.Dispatch(cmdBuffer, fc);
for (size_t i = 0; i < 7; i++) // for (size_t i = 0; i < 7; i++)
this->alphaChains.at(6 - i).Dispatch(cmdBuffer, fc); // this->alphaChains.at(6 - i).Dispatch(cmdBuffer, fc);
this->betaChain.Dispatch(cmdBuffer, fc); // this->betaChain.Dispatch(cmdBuffer, fc);
for (size_t i = 0; i < 4; i++) // for (size_t i = 0; i < 4; i++)
this->gammaChains.at(i).Dispatch(cmdBuffer); // this->gammaChains.at(i).Dispatch(cmdBuffer);
for (size_t i = 0; i < 3; i++) { // for (size_t i = 0; i < 3; i++) {
this->magicChains.at(i).Dispatch(cmdBuffer); // this->magicChains.at(i).Dispatch(cmdBuffer);
this->deltaChains.at(i).Dispatch(cmdBuffer); // this->deltaChains.at(i).Dispatch(cmdBuffer);
this->epsilonChains.at(i).Dispatch(cmdBuffer); // this->epsilonChains.at(i).Dispatch(cmdBuffer);
this->zetaChains.at(i).Dispatch(cmdBuffer); // this->zetaChains.at(i).Dispatch(cmdBuffer);
if (i < 2) // if (i < 2)
this->extractChains.at(i).Dispatch(cmdBuffer); // this->extractChains.at(i).Dispatch(cmdBuffer);
} // }
this->mergeChain.Dispatch(cmdBuffer, fc); // this->mergeChain.Dispatch(cmdBuffer, fc);
cmdBuffer.end(); cmdBuffer.end();

View file

@ -51,12 +51,12 @@ int main() {
// Globals::initializeGlobals(device); // Globals::initializeGlobals(device);
// create downsample shader chain // create downsample shader chain
Core::Image inputImage( // Core::Image inputImage(
device, { 2560, 1411 }, VK_FORMAT_R8G8B8A8_UNORM, // device, { 2560, 1411 }, VK_FORMAT_R8G8B8A8_UNORM,
VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT, // VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT,
VK_IMAGE_ASPECT_COLOR_BIT // VK_IMAGE_ASPECT_COLOR_BIT
); // );
Utils::uploadImage(device, commandPool, inputImage, "rsc/images/source.dds"); // Utils::uploadImage(device, commandPool, inputImage, "rsc/images/source.dds");
// Shaderchains::Downsample downsample(device, descriptorPool, inputImage); // Shaderchains::Downsample downsample(device, descriptorPool, inputImage);
@ -83,7 +83,7 @@ int main() {
// Shaderchains::Beta beta(device, descriptorPool, // Shaderchains::Beta beta(device, descriptorPool,
// betaTemporalImages, // betaTemporalImages,
// alphas.at(0).getOutImages() // alphas.at(0).getOutImages()
); // );
// create gamma to zeta shader chains // create gamma to zeta shader chains
// std::vector<Shaderchains::Gamma> gammas; // std::vector<Shaderchains::Gamma> gammas;