From 3442c9c72216dacc3448d1cbd6ad3bb2a4e2cd4f Mon Sep 17 00:00:00 2001 From: PancakeTAS Date: Sat, 12 Jul 2025 18:59:09 +0200 Subject: [PATCH] lsfg-vk-v3.1p: beta shaders --- lsfg-vk-v3.1p/include/shaders/beta.hpp | 6 +++--- lsfg-vk-v3.1p/src/shaders/beta.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lsfg-vk-v3.1p/include/shaders/beta.hpp b/lsfg-vk-v3.1p/include/shaders/beta.hpp index 6921673..11f6ccc 100644 --- a/lsfg-vk-v3.1p/include/shaders/beta.hpp +++ b/lsfg-vk-v3.1p/include/shaders/beta.hpp @@ -24,11 +24,11 @@ namespace LSFG::Shaders { /// /// Initialize the shaderchain. /// - /// @param inImgs Three sets of four RGBA images, corresponding to a frame count % 3. + /// @param inImgs Three sets of two RGBA images, corresponding to a frame count % 3. /// /// @throws LSFG::vulkan_error if resource creation fails. /// - Beta(Vulkan& vk, std::array, 3> inImgs); + Beta(Vulkan& vk, std::array, 3> inImgs); /// /// Dispatch the shaderchain. @@ -52,7 +52,7 @@ namespace LSFG::Shaders { std::array firstDescriptorSet; std::array descriptorSets; - std::array, 3> inImgs; + std::array, 3> inImgs; std::array tempImgs1; std::array tempImgs2; std::array outImgs; diff --git a/lsfg-vk-v3.1p/src/shaders/beta.cpp b/lsfg-vk-v3.1p/src/shaders/beta.cpp index 64b3fd3..27f554c 100644 --- a/lsfg-vk-v3.1p/src/shaders/beta.cpp +++ b/lsfg-vk-v3.1p/src/shaders/beta.cpp @@ -12,13 +12,13 @@ using namespace LSFG::Shaders; -Beta::Beta(Vulkan& vk, std::array, 3> inImgs) +Beta::Beta(Vulkan& vk, std::array, 3> inImgs) : inImgs(std::move(inImgs)) { // create resources this->shaderModules = {{ vk.shaders.getShader(vk.device, "beta[0]", { { 1, VK_DESCRIPTOR_TYPE_SAMPLER }, - { 12, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE }, + { 6, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE }, { 2, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE } }), vk.shaders.getShader(vk.device, "beta[1]", { { 1, VK_DESCRIPTOR_TYPE_SAMPLER },