@babylonjs/core 7.21.0 → 7.21.2

package/Engines/webgpuEngine.d.ts

@@ -136,6 +136,7 @@ export declare class WebGPUEngine extends AbstractEngine {
     _options: WebGPUEngineOptions;
     private _glslang;
     private _tintWASM;
+    private _glslangAndTintAreFullyLoaded;
     private _adapter;
     private _adapterSupportedExtensions;
     private _adapterInfo;
@@ -624,12 +625,13 @@ export declare class WebGPUEngine extends AbstractEngine {
      * @param onError defines a function to call when the effect creation has failed
      * @param indexParameters defines an object containing the index values to use to compile shaders (like the maximum number of simultaneous lights)
      * @param shaderLanguage the language the shader is written in (default: GLSL)
+     * @param extraInitializationsAsync additional async code to run before preparing the effect
      * @returns the new Effect
      */
     createEffect(baseName: string | (IShaderPath & {
         vertexToken?: string;
         fragmentToken?: string;
-    }), attributesNamesOrOptions: string[] | IEffectCreationOptions, uniformsNamesOrEngine: string[] | AbstractEngine, samplers?: string[], defines?: string, fallbacks?: EffectFallbacks, onCompiled?: Nullable<(effect: Effect) => void>, onError?: Nullable<(effect: Effect, errors: string) => void>, indexParameters?: any, shaderLanguage?: ShaderLanguage): Effect;
+    }), attributesNamesOrOptions: string[] | IEffectCreationOptions, uniformsNamesOrEngine: string[] | AbstractEngine, samplers?: string[], defines?: string, fallbacks?: EffectFallbacks, onCompiled?: Nullable<(effect: Effect) => void>, onError?: Nullable<(effect: Effect, errors: string) => void>, indexParameters?: any, shaderLanguage?: ShaderLanguage, extraInitializationsAsync?: () => Promise<void>): Effect;
     private _compileRawShaderToSpirV;
     private _compileShaderToSpirV;
     private _getWGSLShader;

package/Engines/webgpuEngine.js

@@ -267,6 +267,7 @@ export class WebGPUEngine extends AbstractEngine {
         this._defaultSampleCount = 4; // Only supported value for now.
         this._glslang = null;
         this._tintWASM = null;
+        this._glslangAndTintAreFullyLoaded = false;
         this._adapterInfo = {
             vendor: "",
             architecture: "",
@@ -396,6 +397,7 @@ export class WebGPUEngine extends AbstractEngine {
                     this._glslang = glslang;
                     this._tintWASM = new WebGPUTintWASM();
                     this._tintWASM.initTwgsl(this._twgslOptions ?? this._options?.twgslOptions).then(() => {
+                        this._glslangAndTintAreFullyLoaded = true;
                         resolve();
                     });
                 });
@@ -1479,9 +1481,10 @@ export class WebGPUEngine extends AbstractEngine {
      * @param onError defines a function to call when the effect creation has failed
      * @param indexParameters defines an object containing the index values to use to compile shaders (like the maximum number of simultaneous lights)
      * @param shaderLanguage the language the shader is written in (default: GLSL)
+     * @param extraInitializationsAsync additional async code to run before preparing the effect
      * @returns the new Effect
      */
-    createEffect(baseName, attributesNamesOrOptions, uniformsNamesOrEngine, samplers, defines, fallbacks, onCompiled, onError, indexParameters, shaderLanguage = 0 /* ShaderLanguage.GLSL */) {
+    createEffect(baseName, attributesNamesOrOptions, uniformsNamesOrEngine, samplers, defines, fallbacks, onCompiled, onError, indexParameters, shaderLanguage = 0 /* ShaderLanguage.GLSL */, extraInitializationsAsync) {
         const vertex = typeof baseName === "string" ? baseName : baseName.vertexToken || baseName.vertexSource || baseName.vertexElement || baseName.vertex;
         const fragment = typeof baseName === "string" ? baseName : baseName.fragmentToken || baseName.fragmentSource || baseName.fragmentElement || baseName.fragment;
         const globalDefines = this._getGlobalDefines();
@@ -1498,7 +1501,7 @@ export class WebGPUEngine extends AbstractEngine {
             compiledEffect._refCount++;
             return compiledEffect;
         }
-        const effect = new Effect(baseName, attributesNamesOrOptions, uniformsNamesOrEngine, samplers, this, defines, fallbacks, onCompiled, onError, indexParameters, name, attributesNamesOrOptions.shaderLanguage ?? shaderLanguage);
+        const effect = new Effect(baseName, attributesNamesOrOptions, uniformsNamesOrEngine, samplers, this, defines, fallbacks, onCompiled, onError, indexParameters, name, attributesNamesOrOptions.shaderLanguage ?? shaderLanguage, attributesNamesOrOptions.extraInitializationsAsync ?? extraInitializationsAsync);
         this._compiledEffects[name] = effect;
         return effect;
     }
@@ -1612,7 +1615,7 @@ export class WebGPUEngine extends AbstractEngine {
     async _preparePipelineContext(pipelineContext, vertexSourceCode, fragmentSourceCode, createAsRaw, rawVertexSourceCode, rawFragmentSourceCode, _rebuildRebind, defines, _transformFeedbackVaryings, _key, onReady) {
         const webGpuContext = pipelineContext;
         const shaderLanguage = webGpuContext.shaderProcessingContext.shaderLanguage;
-        if (shaderLanguage === 0 /* ShaderLanguage.GLSL */ && (!this._glslang || !this._tintWASM)) {
+        if (shaderLanguage === 0 /* ShaderLanguage.GLSL */ && !this._glslangAndTintAreFullyLoaded) {
             await this.prepareGlslangAndTintAsync();
         }
         if (this.dbgShowShaderCode) {