Fix wrong parameter passed to clearcoat (#15566)

BabylonJS · Sep 13, 2024 · 9b9d40e · 9b9d40e
1 parent 0dbd60c
commit 9b9d40e
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 25 deletions.
diff --git a/packages/dev/core/src/Materials/Node/Blocks/PBR/clearCoatBlock.ts b/packages/dev/core/src/Materials/Node/Blocks/PBR/clearCoatBlock.ts
@@ -377,11 +377,6 @@ export class ClearCoatBlock extends NodeMaterialBlock {
                     #endif
                 #endif
             #endif
-            #if defined(ENVIRONMENTBRDF) && !defined(${reflectionBlock?._defineSkyboxName})
-                #ifdef RADIANCEOCCLUSION
-                    , ambientMonochrome
-                #endif
-            #endif
             #if defined(CLEARCOAT_BUMP) || defined(TWOSIDEDLIGHTING)
                 , (${state._generateTernary("1.", "-1.", isWebGPU ? "fragmentInputs.frontFacing" : "gl_FrontFacing")})
             #endif

diff --git a/packages/dev/core/src/Shaders/ShadersInclude/pbrBlockClearcoat.fx b/packages/dev/core/src/Shaders/ShadersInclude/pbrBlockClearcoat.fx
@@ -98,11 +98,6 @@ struct clearcoatOutParams
             , in vec2 vReflectionFilteringInfo
         #endif
     #endif
-    #if defined(ENVIRONMENTBRDF) && !defined(REFLECTIONMAP_SKYBOX)
-        #ifdef RADIANCEOCCLUSION
-            , in float ambientMonochrome
-        #endif
-    #endif
     #if defined(CLEARCOAT_BUMP) || defined(TWOSIDEDLIGHTING)
         , in float frontFacingMultiplier
     #endif

diff --git a/packages/dev/core/src/Shaders/pbr.fragment.fx b/packages/dev/core/src/Shaders/pbr.fragment.fx
@@ -477,11 +477,6 @@ void main(void) {
                 , vReflectionFilteringInfo
             #endif
         #endif
-        #if defined(ENVIRONMENTBRDF) && !defined(REFLECTIONMAP_SKYBOX)
-            #ifdef RADIANCEOCCLUSION
-                , ambientMonochrome
-            #endif
-        #endif
         #if defined(CLEARCOAT_BUMP) || defined(TWOSIDEDLIGHTING)
             , (gl_FrontFacing ? 1. : -1.)
         #endif

diff --git a/packages/dev/core/src/ShadersWGSL/ShadersInclude/pbrBlockClearcoat.fx b/packages/dev/core/src/ShadersWGSL/ShadersInclude/pbrBlockClearcoat.fx
@@ -103,11 +103,6 @@ struct clearcoatOutParams
             , vReflectionFilteringInfo: vec2f
         #endif
     #endif
-    #if defined(ENVIRONMENTBRDF) && !defined(REFLECTIONMAP_SKYBOX)
-        #ifdef RADIANCEOCCLUSION
-            , ambientMonochrome: f32
-        #endif
-    #endif
     #if defined(CLEARCOAT_BUMP) || defined(TWOSIDEDLIGHTING)
         , frontFacingMultiplier: f32
     #endif        

diff --git a/packages/dev/core/src/ShadersWGSL/pbr.fragment.fx b/packages/dev/core/src/ShadersWGSL/pbr.fragment.fx
@@ -474,11 +474,6 @@ fn main(input: FragmentInputs) -> FragmentOutputs {
                 , uniforms.vReflectionFilteringInfo
             #endif
         #endif
-        #if defined(ENVIRONMENTBRDF) && !defined(REFLECTIONMAP_SKYBOX)
-            #ifdef RADIANCEOCCLUSION
-                , ambientMonochrome
-            #endif
-        #endif
         #if defined(CLEARCOAT_BUMP) || defined(TWOSIDEDLIGHTING)
             , select(-1., 1., fragmentInputs.frontFacing)
         #endif