fix shadow multiplier mode

when shadow multiplier was used, the material used the wrong variant (unlit).
google · Oct 4, 2024 · e9aeb93 · e9aeb93
1 parent 4be1720
commit e9aeb93
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/libs/filamat/src/GLSLPostProcessor.cpp b/libs/filamat/src/GLSLPostProcessor.cpp
@@ -157,7 +157,9 @@ static void collectDescriptorsForSet(filament::DescriptorSetBindingPoints set,
                     return descriptor_sets::getSsrVariantLayout();
                 }
                 return descriptor_sets::getPerViewDescriptorSetLayout(config.domain,
-                        config.variantFilter, material.isLit, material.reflectionMode,
+                        config.variantFilter,
+                        material.isLit || material.hasShadowMultiplier,
+                        material.reflectionMode,
                         material.refractionMode);
             }
             case DescriptorSetBindingPoints::PER_RENDERABLE:

diff --git a/libs/filamat/src/MaterialBuilder.cpp b/libs/filamat/src/MaterialBuilder.cpp
@@ -1551,7 +1551,7 @@ void MaterialBuilder::writeCommonChunks(ChunkContainer& container, MaterialInfo&
     backend::DescriptorSetLayout const perViewDescriptorSetLayout =
             descriptor_sets::getPerViewDescriptorSetLayout(
             mMaterialDomain, mVariantFilter,
-            info.isLit, info.reflectionMode, info.refractionMode);
+            info.isLit || info.hasShadowMultiplier, info.reflectionMode, info.refractionMode);
 
     // Descriptor layout and descriptor name/binding mapping
     container.push<MaterialDescriptorBindingsChuck>(info.sib, perViewDescriptorSetLayout);

diff --git a/libs/filamat/src/MaterialVariants.cpp b/libs/filamat/src/MaterialVariants.cpp
@@ -86,9 +86,11 @@ std::vector<Variant> determineSurfaceVariants(
                         RefractionMode::CUBEMAP,
                         RefractionMode::NONE }) {
                     auto const vdsl = ShaderGenerator::getPerViewDescriptorSetLayoutWithVariant(
-                            vertexVariant, userVariantFilter, isLit, reflection, refraction);
+                            vertexVariant, userVariantFilter, isLit || shadowMultiplier,
+                            reflection, refraction);
                     auto const fdsl = ShaderGenerator::getPerViewDescriptorSetLayoutWithVariant(
-                            fragmentVariant, userVariantFilter, isLit, reflection, refraction);
+                            fragmentVariant, userVariantFilter, isLit || shadowMultiplier,
+                            reflection, refraction);
                     // Check that all bindings present in the vertex shader DescriptorSetLayout
                     // are also present in the fragment shader DescriptorSetLayout.
                     for (auto const& r: vdsl.bindings) {

diff --git a/libs/filamat/src/shaders/ShaderGenerator.cpp b/libs/filamat/src/shaders/ShaderGenerator.cpp
@@ -608,7 +608,8 @@ std::string ShaderGenerator::createFragmentProgram(ShaderModel shaderModel,
 
         auto const perViewDescriptorSetLayout = getPerViewDescriptorSetLayoutWithVariant(
                 variant, variantFilter,
-                material.isLit, material.reflectionMode, material.refractionMode);
+                material.isLit || material.hasShadowMultiplier,
+                material.reflectionMode, material.refractionMode);
 
         // this is the list of samplers we need to filter
         auto list = SibGenerator::getPerViewSib(variant).getSamplerInfoList();