@babylonjs/core 7.21.0 → 7.21.2

package/Materials/standardMaterial.js

@@ -440,7 +440,15 @@ export class StandardMaterial extends PushMaterial {
         this._worldViewProjectionMatrix = Matrix.Zero();
         this._globalAmbientColor = new Color3(0, 0, 0);
         this._cacheHasRenderTargetTextures = false;
-        this._initShaderSourceAsync(forceGLSL);
+        const engine = this.getScene().getEngine();
+        if (engine.isWebGPU && !forceGLSL && !StandardMaterial.ForceGLSL) {
+            // Switch main UBO to non UBO to connect to leftovers UBO in webgpu
+            if (this._uniformBuffer) {
+                this._uniformBuffer.dispose();
+            }
+            this._uniformBuffer = new UniformBuffer(engine, undefined, undefined, this.name, true);
+            this._shaderLanguage = 1 /* ShaderLanguage.WGSL */;
+        }
         this.detailMap = new DetailMapConfiguration(this);
         // Setup the default processing configuration to the scene.
         this._attachImageProcessingConfiguration(null);
@@ -458,22 +466,6 @@ export class StandardMaterial extends PushMaterial {
             return this._renderTargets;
         };
     }
-    async _initShaderSourceAsync(forceGLSL = false) {
-        const engine = this.getScene().getEngine();
-        if (engine.isWebGPU && !forceGLSL && !StandardMaterial.ForceGLSL) {
-            // Switch main UBO to non UBO to connect to leftovers UBO in webgpu
-            if (this._uniformBuffer) {
-                this._uniformBuffer.dispose();
-            }
-            this._uniformBuffer = new UniformBuffer(engine, undefined, undefined, this.name, true);
-            this._shaderLanguage = 1 /* ShaderLanguage.WGSL */;
-            await Promise.all([import("../ShadersWGSL/default.vertex.js"), import("../ShadersWGSL/default.fragment.js")]);
-        }
-        else {
-            await Promise.all([import("../Shaders/default.vertex.js"), import("../Shaders/default.fragment.js")]);
-        }
-        this._shadersLoaded = true;
-    }
     /**
      * Gets a boolean indicating that current material needs to register RTT
      */
@@ -545,9 +537,6 @@ export class StandardMaterial extends PushMaterial {
      * @returns a boolean indicating that the submesh is ready or not
      */
     isReadyForSubMesh(mesh, subMesh, useInstances = false) {
-        if (!this._shadersLoaded) {
-            return false;
-        }
         if (!this._uniformBufferLayoutBuilt) {
             this.buildUniformLayout();
         }
@@ -1016,6 +1005,17 @@ export class StandardMaterial extends PushMaterial {
                 processCodeAfterIncludes: this._eventInfo.customCode,
                 multiTarget: defines.PREPASS,
                 shaderLanguage: this._shaderLanguage,
+                extraInitializationsAsync: this._shadersLoaded
+                    ? undefined
+                    : async () => {
+                        if (this._shaderLanguage === 1 /* ShaderLanguage.WGSL */) {
+                            await Promise.all([import("../ShadersWGSL/default.vertex.js"), import("../ShadersWGSL/default.fragment.js")]);
+                        }
+                        else {
+                            await Promise.all([import("../Shaders/default.vertex.js"), import("../Shaders/default.fragment.js")]);
+                        }
+                        this._shadersLoaded = true;
+                    },
             }, engine);
             this._eventInfo.customCode = undefined;
             if (effect) {