@babylonjs/core 9.5.1 → 9.6.0

package/Materials/materialHelper.functions.d.ts

@@ -329,8 +329,9 @@ export declare function PrepareDefinesForCamera(scene: Scene, defines: any): boo
  * @param iesLightTexture defines if IES texture must be used
  * @param clusteredLightTextures defines if the clustered light textures must be used
  * @param rectAreaLightTexture defines if rect area light is using a emission texture.
+ * @param clusteredLightStorageBuffer defines if the clustered light tile mask uses a storage buffer instead of a texture
  */
-export declare function PrepareUniformsAndSamplersForLight(lightIndex: number, uniformsList: string[], samplersList: string[], projectedLightTexture?: any, uniformBuffersList?: Nullable<string[]>, updateOnlyBuffersList?: boolean, iesLightTexture?: boolean, clusteredLightTextures?: boolean, rectAreaLightTexture?: boolean): void;
+export declare function PrepareUniformsAndSamplersForLight(lightIndex: number, uniformsList: string[], samplersList: string[], projectedLightTexture?: any, uniformBuffersList?: Nullable<string[]>, updateOnlyBuffersList?: boolean, iesLightTexture?: boolean, clusteredLightTextures?: boolean, rectAreaLightTexture?: boolean, clusteredLightStorageBuffer?: boolean): void;
 /**
  * Append uniforms and samplers related to IBL to the provided lists
  * @param uniformsList The list of uniforms to append to

package/Materials/materialHelper.functions.js

@@ -1161,8 +1161,9 @@ export function PrepareDefinesForCamera(scene, defines) {
  * @param iesLightTexture defines if IES texture must be used
  * @param clusteredLightTextures defines if the clustered light textures must be used
  * @param rectAreaLightTexture defines if rect area light is using a emission texture.
+ * @param clusteredLightStorageBuffer defines if the clustered light tile mask uses a storage buffer instead of a texture
  */
-export function PrepareUniformsAndSamplersForLight(lightIndex, uniformsList, samplersList, projectedLightTexture, uniformBuffersList = null, updateOnlyBuffersList = false, iesLightTexture = false, clusteredLightTextures = false, rectAreaLightTexture = false) {
+export function PrepareUniformsAndSamplersForLight(lightIndex, uniformsList, samplersList, projectedLightTexture, uniformBuffersList = null, updateOnlyBuffersList = false, iesLightTexture = false, clusteredLightTextures = false, rectAreaLightTexture = false, clusteredLightStorageBuffer = false) {
     if (uniformBuffersList) {
         uniformBuffersList.push("Light" + lightIndex);
     }
@@ -1185,7 +1186,9 @@ export function PrepareUniformsAndSamplersForLight(lightIndex, uniformsList, sam
     }
     if (clusteredLightTextures) {
         samplersList.push("lightDataTexture" + lightIndex);
-        samplersList.push("tileMaskTexture" + lightIndex);
+        if (!clusteredLightStorageBuffer) {
+            samplersList.push("tileMaskTexture" + lightIndex);
+        }
     }
 }
 /**
@@ -1222,6 +1225,7 @@ export function PrepareUniformsAndSamplersForIBL(uniformsList, samplersList, use
 export function PrepareUniformsAndSamplersList(uniformsListOrOptions, samplersList, defines, maxSimultaneousLights = 4) {
     let uniformsList;
     let uniformBuffersList;
+    let shaderLanguage = null;
     if (uniformsListOrOptions.uniformsNames) {
         const options = uniformsListOrOptions;
         uniformsList = options.uniformsNames;
@@ -1229,6 +1233,7 @@ export function PrepareUniformsAndSamplersList(uniformsListOrOptions, samplersLi
         samplersList = options.samplers;
         defines = options.defines;
         maxSimultaneousLights = options.maxSimultaneousLights || 0;
+        shaderLanguage = options.shaderLanguage ?? null;
     }
     else {
         uniformsList = uniformsListOrOptions;
@@ -1240,7 +1245,7 @@ export function PrepareUniformsAndSamplersList(uniformsListOrOptions, samplersLi
         if (!defines["LIGHT" + lightIndex]) {
             break;
         }
-        PrepareUniformsAndSamplersForLight(lightIndex, uniformsList, samplersList, defines["PROJECTEDLIGHTTEXTURE" + lightIndex], uniformBuffersList, false, defines["IESLIGHTTEXTURE" + lightIndex], defines["CLUSTLIGHT" + lightIndex], defines["RECTAREALIGHTEMISSIONTEXTURE" + lightIndex]);
+        PrepareUniformsAndSamplersForLight(lightIndex, uniformsList, samplersList, defines["PROJECTEDLIGHTTEXTURE" + lightIndex], uniformBuffersList, false, defines["IESLIGHTTEXTURE" + lightIndex], defines["CLUSTLIGHT" + lightIndex], defines["RECTAREALIGHTEMISSIONTEXTURE" + lightIndex], shaderLanguage === 1 /* ShaderLanguage.WGSL */);
     }
     if (defines["NUM_MORPH_INFLUENCERS"]) {
         uniformsList.push("morphTargetInfluences");