Skip to content

Commit 8ceac68

Browse files
authored
Merge branch 'playcanvas:main' into main
2 parents acb517a + afd9b38 commit 8ceac68

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/scene/shader-lib/programs/shader-generator-shader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class ShaderGeneratorShader extends ShaderGenerator {
8686
createShaderDefinition(device, options) {
8787

8888
const desc = options.shaderDesc;
89-
const wgsl = device.isWebGPU && !!desc.vertexWGSL && !!desc.fragmentWGSL;
89+
const wgsl = device.isWebGPU && !!desc.vertexWGSL && !!desc.fragmentWGSL && (options.shaderChunks?.useWGSL ?? true);
9090
const definitionOptions = {
9191
name: `ShaderMaterial-${desc.uniqueName}`,
9292
shaderLanguage: wgsl ? SHADERLANGUAGE_WGSL : SHADERLANGUAGE_GLSL,

0 commit comments

Comments
 (0)