Skip to content

Commit b07b755

Browse files
Popov72Copilot
andcommitted
Propagate clustered light shader language
Pass material shader language through materials-library clustered light preparation and correct the WebGPU storage-buffer comment. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 8cb7c4a commit b07b755

12 files changed

Lines changed: 12 additions & 1 deletion

File tree

packages/dev/core/src/Lights/Clustered/clusteredLightContainer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class ClusteredLightContainer extends Light {
4545
if (!caps.texelFetch) {
4646
return 0;
4747
} else if (engine.isWebGPU) {
48-
// On WebGPU we use atomic writes to storage textures
48+
// On WebGPU we use atomic writes to storage buffers
4949
return 32;
5050
} else if (engine.version > 1) {
5151
// On WebGL 2 we use additive float blending as the light mask

packages/dev/materials/src/cell/cellMaterial.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ export class CellMaterial extends PushMaterial {
252252
samplers: samplers,
253253
defines: defines,
254254
maxSimultaneousLights: this.maxSimultaneousLights,
255+
shaderLanguage: this._shaderLanguage,
255256
});
256257
subMesh.setEffect(
257258
scene.getEngine().createEffect(

packages/dev/materials/src/fur/furMaterial.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ export class FurMaterial extends PushMaterial {
338338
samplers: samplers,
339339
defines: defines,
340340
maxSimultaneousLights: this.maxSimultaneousLights,
341+
shaderLanguage: this._shaderLanguage,
341342
});
342343

343344
subMesh.setEffect(

packages/dev/materials/src/gradient/gradientMaterial.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ export class GradientMaterial extends PushMaterial {
245245
samplers: samplers,
246246
defines: defines,
247247
maxSimultaneousLights: 4,
248+
shaderLanguage: this._shaderLanguage,
248249
});
249250

250251
subMesh.setEffect(

packages/dev/materials/src/lava/lavaMaterial.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ export class LavaMaterial extends PushMaterial {
320320
samplers: samplers,
321321
defines: defines,
322322
maxSimultaneousLights: this.maxSimultaneousLights,
323+
shaderLanguage: this._shaderLanguage,
323324
});
324325

325326
subMesh.setEffect(

packages/dev/materials/src/mix/mixMaterial.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ export class MixMaterial extends PushMaterial {
360360
samplers: samplers,
361361
defines: defines,
362362
maxSimultaneousLights: this.maxSimultaneousLights,
363+
shaderLanguage: this._shaderLanguage,
363364
});
364365

365366
subMesh.setEffect(

packages/dev/materials/src/normal/normalMaterial.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ export class NormalMaterial extends PushMaterial {
286286
samplers: samplers,
287287
defines: defines,
288288
maxSimultaneousLights: 4,
289+
shaderLanguage: this._shaderLanguage,
289290
});
290291

291292
subMesh.setEffect(

packages/dev/materials/src/shadowOnly/shadowOnlyMaterial.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ export class ShadowOnlyMaterial extends PushMaterial {
233233
samplers: samplers,
234234
defines: defines,
235235
maxSimultaneousLights: 1,
236+
shaderLanguage: this._shaderLanguage,
236237
});
237238

238239
subMesh.setEffect(

packages/dev/materials/src/simple/simpleMaterial.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ export class SimpleMaterial extends PushMaterial {
241241
samplers: samplers,
242242
defines: defines,
243243
maxSimultaneousLights: this.maxSimultaneousLights,
244+
shaderLanguage: this._shaderLanguage,
244245
});
245246
subMesh.setEffect(
246247
scene.getEngine().createEffect(

packages/dev/materials/src/terrain/terrainMaterial.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ export class TerrainMaterial extends PushMaterial {
320320
samplers: samplers,
321321
defines: defines,
322322
maxSimultaneousLights: this.maxSimultaneousLights,
323+
shaderLanguage: this._shaderLanguage,
323324
});
324325

325326
subMesh.setEffect(

0 commit comments

Comments
 (0)