From fbb34e95f83d759b8cc086ebb9303528186130b6 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Tue, 7 Sep 2021 16:28:38 +0200
Subject: [PATCH] [#105] Fixed compiler errors regarding constructor changes
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
.../material/src/vkcv/material/Material.cpp | 40 ++++++++++++-----
.../src/vkcv/upscaling/FSRUpscaling.cpp | 45 ++++++++++---------
2 files changed, 54 insertions(+), 31 deletions(-)
diff --git a/modules/material/src/vkcv/material/Material.cpp b/modules/material/src/vkcv/material/Material.cpp
index 43a72e4c..bd26733b 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 88436c14..69690c7e 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));
--
GitLab