lsfg-vk-v3.1p: beta shaders

This commit is contained in:
PancakeTAS 2025-07-12 18:59:09 +02:00
parent 2d66e1cade
commit 3442c9c722
No known key found for this signature in database
2 changed files with 5 additions and 5 deletions

View file

@ -24,11 +24,11 @@ namespace LSFG::Shaders {
/// ///
/// Initialize the shaderchain. /// 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. /// @throws LSFG::vulkan_error if resource creation fails.
/// ///
Beta(Vulkan& vk, std::array<std::array<Core::Image, 4>, 3> inImgs); Beta(Vulkan& vk, std::array<std::array<Core::Image, 2>, 3> inImgs);
/// ///
/// Dispatch the shaderchain. /// Dispatch the shaderchain.
@ -52,7 +52,7 @@ namespace LSFG::Shaders {
std::array<Core::DescriptorSet, 3> firstDescriptorSet; std::array<Core::DescriptorSet, 3> firstDescriptorSet;
std::array<Core::DescriptorSet, 4> descriptorSets; std::array<Core::DescriptorSet, 4> descriptorSets;
std::array<std::array<Core::Image, 4>, 3> inImgs; std::array<std::array<Core::Image, 2>, 3> inImgs;
std::array<Core::Image, 2> tempImgs1; std::array<Core::Image, 2> tempImgs1;
std::array<Core::Image, 2> tempImgs2; std::array<Core::Image, 2> tempImgs2;
std::array<Core::Image, 6> outImgs; std::array<Core::Image, 6> outImgs;

View file

@ -12,13 +12,13 @@
using namespace LSFG::Shaders; using namespace LSFG::Shaders;
Beta::Beta(Vulkan& vk, std::array<std::array<Core::Image, 4>, 3> inImgs) Beta::Beta(Vulkan& vk, std::array<std::array<Core::Image, 2>, 3> inImgs)
: inImgs(std::move(inImgs)) { : inImgs(std::move(inImgs)) {
// create resources // create resources
this->shaderModules = {{ this->shaderModules = {{
vk.shaders.getShader(vk.device, "beta[0]", vk.shaders.getShader(vk.device, "beta[0]",
{ { 1, VK_DESCRIPTOR_TYPE_SAMPLER }, { { 1, VK_DESCRIPTOR_TYPE_SAMPLER },
{ 12, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE }, { 6, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE },
{ 2, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE } }), { 2, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE } }),
vk.shaders.getShader(vk.device, "beta[1]", vk.shaders.getShader(vk.device, "beta[1]",
{ { 1, VK_DESCRIPTOR_TYPE_SAMPLER }, { { 1, VK_DESCRIPTOR_TYPE_SAMPLER },