diff --git a/modules/material/src/vkcv/material/Material.cpp b/modules/material/src/vkcv/material/Material.cpp index 43a72e4cb6c936457f3723e32dc2715d9788ce08..bd26733b878634e3caf5b927e8c0307432279212 100644 --- a/modules/material/src/vkcv/material/Material.cpp +++ b/modules/material/src/vkcv/material/Material.cpp @@ -36,16 +36,36 @@ namespace vkcv::material { case MaterialType::PBR_MATERIAL: if (pbr_bindings.empty()) { - pbr_bindings.insert(std::make_pair(0, DescriptorBinding(0, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT))); - pbr_bindings.insert(std::make_pair(1, DescriptorBinding(1, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT))); - pbr_bindings.insert(std::make_pair(2, DescriptorBinding(2, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT))); - pbr_bindings.insert(std::make_pair(3, DescriptorBinding(3, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT))); - pbr_bindings.insert(std::make_pair(4, DescriptorBinding(4, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT))); - pbr_bindings.insert(std::make_pair(5, DescriptorBinding(5, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT))); - pbr_bindings.insert(std::make_pair(6, DescriptorBinding(6, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT))); - pbr_bindings.insert(std::make_pair(7, DescriptorBinding(7, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT))); - pbr_bindings.insert(std::make_pair(8, DescriptorBinding(8, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT))); - pbr_bindings.insert(std::make_pair(9, DescriptorBinding(9, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT))); + pbr_bindings.insert(std::make_pair(0, DescriptorBinding { + 0, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT, false + })); + pbr_bindings.insert(std::make_pair(1, DescriptorBinding { + 1, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT, false + })); + pbr_bindings.insert(std::make_pair(2, DescriptorBinding { + 2, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT, false + })); + pbr_bindings.insert(std::make_pair(3, DescriptorBinding { + 3, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT, false + })); + pbr_bindings.insert(std::make_pair(4, DescriptorBinding { + 4, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT, false + })); + pbr_bindings.insert(std::make_pair(5, DescriptorBinding { + 5, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT, false + })); + pbr_bindings.insert(std::make_pair(6, DescriptorBinding { + 6, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT, false + })); + pbr_bindings.insert(std::make_pair(7, DescriptorBinding { + 7, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT, false + })); + pbr_bindings.insert(std::make_pair(8, DescriptorBinding { + 8, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT, false + })); + pbr_bindings.insert(std::make_pair(9, DescriptorBinding { + 9, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT, false + })); } return pbr_bindings; diff --git a/modules/upscaling/src/vkcv/upscaling/FSRUpscaling.cpp b/modules/upscaling/src/vkcv/upscaling/FSRUpscaling.cpp index 88436c148d711638554f82a0cfb7be2dc81c998e..69690c7e230c695ecaf44870d31adbf9ab2b23d1 100644 --- a/modules/upscaling/src/vkcv/upscaling/FSRUpscaling.cpp +++ b/modules/upscaling/src/vkcv/upscaling/FSRUpscaling.cpp @@ -68,33 +68,36 @@ namespace vkcv::upscaling { static DescriptorBindings getDescriptorBindings() { DescriptorBindings descriptorBindings = {}; - auto binding_0 = DescriptorBinding( + auto binding_0 = DescriptorBinding { 0, DescriptorType::UNIFORM_BUFFER_DYNAMIC, 1, - ShaderStage::COMPUTE - ); + ShaderStage::COMPUTE, + false + }; - auto binding_1 = DescriptorBinding( - 1, - DescriptorType::IMAGE_SAMPLED, - 1, - ShaderStage::COMPUTE - ); + auto binding_1 = DescriptorBinding { + 1, + DescriptorType::IMAGE_SAMPLED, + 1, + ShaderStage::COMPUTE, + false + }; - auto binding_2 = DescriptorBinding( - 2, - DescriptorType::IMAGE_STORAGE, - 1, - ShaderStage::COMPUTE - ); + auto binding_2 = DescriptorBinding{ + 2, + DescriptorType::IMAGE_STORAGE, + 1, + ShaderStage::COMPUTE, + false + }; - auto binding_3 = DescriptorBinding( - 3, - DescriptorType::SAMPLER, - 1, - ShaderStage::COMPUTE - ); + auto binding_3 = DescriptorBinding{ + 3, + DescriptorType::SAMPLER, + 1, + ShaderStage::COMPUTE + }; descriptorBindings.insert(std::make_pair(0, binding_0)); descriptorBindings.insert(std::make_pair(1, binding_1));