From 019dd214c7d4c47a085cb2dc2dd912db01d6665c Mon Sep 17 00:00:00 2001 From: PancakeTAS Date: Sat, 6 Dec 2025 17:34:37 +0100 Subject: [PATCH] refactor(cleanup): fix shaders --- lsfg-vk-backend/src/lsfgvk.cpp | 6 ++---- lsfg-vk-backend/src/shaderchains/delta0.cpp | 5 ++--- lsfg-vk-backend/src/shaderchains/delta0.hpp | 4 +--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/lsfg-vk-backend/src/lsfgvk.cpp b/lsfg-vk-backend/src/lsfgvk.cpp index ade18c4..a19cb23 100644 --- a/lsfg-vk-backend/src/lsfgvk.cpp +++ b/lsfg-vk-backend/src/lsfgvk.cpp @@ -404,8 +404,7 @@ ContextImpl::ContextImpl(const InstanceImpl& instance, pass.delta0.emplace_back(ctx, i, this->alpha1.at(6 - j).getImages(), this->blackImage, - pass.gamma1.at(j - 1).getImage(), - this->blackImage + pass.gamma1.at(j - 1).getImage() ); pass.delta1.emplace_back(ctx, i, pass.delta0.at(j - 4).getImages0(), @@ -418,8 +417,7 @@ ContextImpl::ContextImpl(const InstanceImpl& instance, pass.delta0.emplace_back(ctx, i, this->alpha1.at(6 - j).getImages(), pass.delta1.at(j - 5).getImage0(), - pass.gamma1.at(j - 1).getImage(), - this->beta1.getImages().at(6 - j) + pass.gamma1.at(j - 1).getImage() ); pass.delta1.emplace_back(ctx, i, pass.delta0.at(j - 4).getImages0(), diff --git a/lsfg-vk-backend/src/shaderchains/delta0.cpp b/lsfg-vk-backend/src/shaderchains/delta0.cpp index 1eca261..25cb0b3 100644 --- a/lsfg-vk-backend/src/shaderchains/delta0.cpp +++ b/lsfg-vk-backend/src/shaderchains/delta0.cpp @@ -14,8 +14,7 @@ using namespace chains; Delta0::Delta0(const ls::Ctx& ctx, size_t idx, const std::vector>& sourceImages, const vk::Image& additionalInput0, - const vk::Image& additionalInput1, - const vk::Image& additionalInput2) { + const vk::Image& additionalInput1) { const size_t m = ctx.perf ? 1 : 2; // multiplier const VkExtent2D extent = sourceImages.at(0).at(0).getExtent(); @@ -49,7 +48,7 @@ Delta0::Delta0(const ls::Ctx& ctx, size_t idx, .sampleds(sourceImages.at((i + 2) % 3)) .sampleds(sourceImages.at(i % 3)) .sampled(additionalInput1) - .sampled(additionalInput2) + .sampled(additionalInput0) .storages(this->images1) .sampler(ctx.bnwSampler) .sampler(ctx.eabSampler) diff --git a/lsfg-vk-backend/src/shaderchains/delta0.hpp b/lsfg-vk-backend/src/shaderchains/delta0.hpp index 29e33c8..1371b9d 100644 --- a/lsfg-vk-backend/src/shaderchains/delta0.hpp +++ b/lsfg-vk-backend/src/shaderchains/delta0.hpp @@ -21,12 +21,10 @@ namespace chains { /// @param sourceImages source images /// @param additionalInput0 additional input image /// @param additionalInput1 additional input image - /// @param additionalInput2 additional input image Delta0(const ls::Ctx& ctx, size_t idx, const std::vector>& sourceImages, const vk::Image& additionalInput0, - const vk::Image& additionalInput1, - const vk::Image& additionalInput2); + const vk::Image& additionalInput1); /// prepare the shaderchain initially /// @param cmd command buffer