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

[#57] Fixed compiler errors

parent 24e3df7c
No related branches found
No related tags found
1 merge request!44Resolve "Material (Modul)"
Pipeline #25960 passed
...@@ -89,6 +89,10 @@ namespace vkcv::material ...@@ -89,6 +89,10 @@ namespace vkcv::material
SamplerHandle &normalSmp, SamplerHandle &normalSmp,
ImageHandle &metRoughImg, ImageHandle &metRoughImg,
SamplerHandle &metRoughSmp, SamplerHandle &metRoughSmp,
ImageHandle &occlusionImg,
SamplerHandle &occlusionSmp,
ImageHandle &emissiveImg,
SamplerHandle &emissiveSmp,
vec4 baseColorFactor, vec4 baseColorFactor,
float metallicFactor, float metallicFactor,
float roughnessFactor, float roughnessFactor,
......
...@@ -43,16 +43,22 @@ namespace vkcv::material ...@@ -43,16 +43,22 @@ namespace vkcv::material
std::vector<DescriptorBinding> PBRMaterial::getDescriptorBindings() noexcept std::vector<DescriptorBinding> PBRMaterial::getDescriptorBindings() noexcept
{ {
return {{DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT}, static std::vector<DescriptorBinding> bindings;
{DescriptorType::SAMPLER , 1, ShaderStage::FRAGMENT},
{DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT}, if (bindings.empty()) {
{DescriptorType::SAMPLER , 1, ShaderStage::FRAGMENT}, bindings.emplace_back(0, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT);
{DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT}, bindings.emplace_back(1, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT);
{DescriptorType::SAMPLER , 1, ShaderStage::FRAGMENT}, bindings.emplace_back(2, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT);
{DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT}, bindings.emplace_back(3, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT);
{DescriptorType::SAMPLER , 1, ShaderStage::FRAGMENT}, bindings.emplace_back(4, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT);
{DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT}, bindings.emplace_back(5, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT);
{DescriptorType::SAMPLER , 1, ShaderStage::FRAGMENT}}; bindings.emplace_back(6, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT);
bindings.emplace_back(7, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT);
bindings.emplace_back(8, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT);
bindings.emplace_back(9, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT);
}
return bindings;
} }
PBRMaterial PBRMaterial::create( PBRMaterial PBRMaterial::create(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment