Skip to content
Snippets Groups Projects
Verified Commit fbb34e95 authored by Tobias Frisch's avatar Tobias Frisch
Browse files

[#105] Fixed compiler errors regarding constructor changes

parent 336638c0
No related branches found
No related tags found
1 merge request!88Resolve "Indirect Draw"
Pipeline #27095 passed
...@@ -36,16 +36,36 @@ namespace vkcv::material { ...@@ -36,16 +36,36 @@ namespace vkcv::material {
case MaterialType::PBR_MATERIAL: case MaterialType::PBR_MATERIAL:
if (pbr_bindings.empty()) 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(0, DescriptorBinding {
pbr_bindings.insert(std::make_pair(1, DescriptorBinding(1, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT))); 0, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT, false
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(1, DescriptorBinding {
pbr_bindings.insert(std::make_pair(4, DescriptorBinding(4, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT))); 1, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT, false
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(2, DescriptorBinding {
pbr_bindings.insert(std::make_pair(7, DescriptorBinding(7, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT))); 2, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT, false
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(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; return pbr_bindings;
......
...@@ -68,33 +68,36 @@ namespace vkcv::upscaling { ...@@ -68,33 +68,36 @@ namespace vkcv::upscaling {
static DescriptorBindings getDescriptorBindings() { static DescriptorBindings getDescriptorBindings() {
DescriptorBindings descriptorBindings = {}; DescriptorBindings descriptorBindings = {};
auto binding_0 = DescriptorBinding( auto binding_0 = DescriptorBinding {
0, 0,
DescriptorType::UNIFORM_BUFFER_DYNAMIC, DescriptorType::UNIFORM_BUFFER_DYNAMIC,
1, 1,
ShaderStage::COMPUTE ShaderStage::COMPUTE,
); false
};
auto binding_1 = DescriptorBinding( auto binding_1 = DescriptorBinding {
1, 1,
DescriptorType::IMAGE_SAMPLED, DescriptorType::IMAGE_SAMPLED,
1, 1,
ShaderStage::COMPUTE ShaderStage::COMPUTE,
); false
};
auto binding_2 = DescriptorBinding( auto binding_2 = DescriptorBinding{
2, 2,
DescriptorType::IMAGE_STORAGE, DescriptorType::IMAGE_STORAGE,
1, 1,
ShaderStage::COMPUTE ShaderStage::COMPUTE,
); false
};
auto binding_3 = DescriptorBinding( auto binding_3 = DescriptorBinding{
3, 3,
DescriptorType::SAMPLER, DescriptorType::SAMPLER,
1, 1,
ShaderStage::COMPUTE ShaderStage::COMPUTE
); };
descriptorBindings.insert(std::make_pair(0, binding_0)); descriptorBindings.insert(std::make_pair(0, binding_0));
descriptorBindings.insert(std::make_pair(1, binding_1)); descriptorBindings.insert(std::make_pair(1, binding_1));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment