Ported clearQuad to avoid using twgsl by default (#14933)

BabylonJS · Mar 30, 2024 · 040fb05 · 040fb05
1 parent 9cc9591
commit 040fb05
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 28 deletions.
diff --git a/packages/dev/core/src/Engines/WebGPU/webgpuClearQuad.ts b/packages/dev/core/src/Engines/WebGPU/webgpuClearQuad.ts
@@ -13,8 +13,9 @@ import { WebGPUShaderProcessingContext } from "./webgpuShaderProcessingContext";
 import { WebGPUTextureHelper } from "./webgpuTextureHelper";
 import { renderableTextureFormatToIndex } from "./webgpuTextureManager";
 
-import "../../Shaders/clearQuad.vertex";
-import "../../Shaders/clearQuad.fragment";
+import "../../ShadersWGSL/clearQuad.vertex";
+import "../../ShadersWGSL/clearQuad.fragment";
+import { ShaderLanguage } from "../../Materials/shaderLanguage";
 
 /** @internal */
 export class WebGPUClearQuad {
@@ -49,7 +50,7 @@ export class WebGPUClearQuad {
         this._cacheRenderPipeline.setDepthTestEnabled(false);
         this._cacheRenderPipeline.setStencilReadMask(0xff);
 
-        this._effect = engine.createEffect("clearQuad", [], ["color", "depthValue"]);
+        this._effect = engine.createEffect("clearQuad", [], ["color", "depthValue"], undefined, undefined, undefined, undefined, undefined, undefined, ShaderLanguage.WGSL);
     }
 
     public clear(

diff --git a/packages/dev/core/src/Shaders/clearQuad.fragment.fx b/packages/dev/core/src/Shaders/clearQuad.fragment.fx
diff --git a/packages/dev/core/src/Shaders/clearQuad.vertex.fx b/packages/dev/core/src/Shaders/clearQuad.vertex.fx
diff --git a/packages/dev/core/src/ShadersWGSL/clearQuad.fragment.fx b/packages/dev/core/src/ShadersWGSL/clearQuad.fragment.fx
@@ -0,0 +1,6 @@
+uniform color: vec4f;
+
+@fragment
+fn main(input: FragmentInputs) -> FragmentOutputs {
+	fragmentOutputs.color = uniforms.color;
+}
diff --git a/packages/dev/core/src/ShadersWGSL/clearQuad.vertex.fx b/packages/dev/core/src/ShadersWGSL/clearQuad.vertex.fx
@@ -0,0 +1,20 @@
+uniform depthValue: f32;
+
+const pos = array(
+    vec2f(-1.0, 1.0),
+    vec2f(1.0, 1.0),
+    vec2f(-1.0, -1.0),
+    vec2f(1.0, -1.0)
+);
+
+
+#define CUSTOM_VERTEX_DEFINITIONS
+
+@vertex
+fn main(input : VertexInputs) -> FragmentInputs {
+
+#define CUSTOM_VERTEX_MAIN_BEGIN
+    vertexOutputs.position = vec4f(pos[input.vertexIndex], uniforms.depthValue, 1.0);
+
+#define CUSTOM_VERTEX_MAIN_END
+}