Merge pull request BabylonJS#15760 from Popov72/fix-webgpu-glowlayer

Glow layer: Fix crash when using vertex alpha in WebGPU
alekop · Nov 2, 2024 · eff57de · eff57de
2 parents baf83eb + 121165e
commit eff57de
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/packages/dev/core/src/ShadersWGSL/background.vertex.fx b/packages/dev/core/src/ShadersWGSL/background.vertex.fx
@@ -145,7 +145,7 @@ fn main(input : VertexInputs) -> FragmentInputs {
 
     // Vertex color
 #ifdef VERTEXCOLOR
-    vertexOutputs.vColor = color;
+    vertexOutputs.vColor = vertexInputs.color;
 #endif
 
 #include<logDepthVertex>

diff --git a/packages/dev/core/src/ShadersWGSL/glowMapGeneration.fragment.fx b/packages/dev/core/src/ShadersWGSL/glowMapGeneration.fragment.fx
@@ -70,7 +70,7 @@ var finalColor: vec4f = uniforms.glowColor;
 #endif
 
 #ifdef VERTEXALPHA
-    finalColor = vec4f(finalColor.rgb, finalColor.a * vColor.a);
+    finalColor = vec4f(finalColor.rgb, finalColor.a * fragmentInputs.vColor.a);
 #endif
 
 #ifdef ALPHATEST

diff --git a/packages/dev/core/src/ShadersWGSL/glowMapGeneration.vertex.fx b/packages/dev/core/src/ShadersWGSL/glowMapGeneration.vertex.fx
@@ -99,7 +99,7 @@ var worldPos: vec4f = finalWorld *  vec4f(positionUpdated, 1.0);
 #endif
 
 #ifdef VERTEXALPHA
-    vertexOutputs.vColor = color;
+    vertexOutputs.vColor = vertexInputs.color;
 #endif
 
 #include<clipPlaneVertex>

diff --git a/...tools/tests/test/visualization/ReferenceImages/Glow-layer-with-vertex-alpha.png b/...tools/tests/test/visualization/ReferenceImages/Glow-layer-with-vertex-alpha.png
diff --git a/packages/tools/tests/test/visualization/config.json b/packages/tools/tests/test/visualization/config.json
@@ -2250,6 +2250,11 @@
             "referenceImage": "voxelShadows.png",
             "renderCount": 15,
             "excludedEngines": ["webgl1", "webgpu"]
+        },
+        {
+            "title": "Glow layer with vertex alpha",
+            "playgroundId": "#GWAX2G#7",
+            "referenceImage": "Glow-layer-with-vertex-alpha.png"
         }
     ]
 }