@babylonjs/core 7.19.1 → 7.20.0

package/Engines/webgpuEngine.d.ts

@@ -120,10 +120,8 @@ export interface WebGPUEngineOptions extends AbstractEngineOptions, GPURequestAd
  * @since 5.0.0
  */
 export declare class WebGPUEngine extends AbstractEngine {
-    private static readonly _GLSLslangDefaultOptions;
+    private static readonly _GlslangDefaultOptions;
     private static _InstanceId;
-    /** true to enable using TintWASM to convert Spir-V to WGSL */
-    static UseTWGSL: boolean;
     /** A unique id to identify this instance */
     readonly uniqueId = -1;
     private readonly _uploadEncoderDescriptor;
@@ -373,6 +371,12 @@ export declare class WebGPUEngine extends AbstractEngine {
      * @param options Defines the options passed to the engine to create the GPU context dependencies
      */
     constructor(canvas: HTMLCanvasElement | OffscreenCanvas, options?: WebGPUEngineOptions);
+    private _workingGlslangAndTintPromise;
+    /**
+     * Load the glslang and tintWASM libraries and prepare them for use.
+     * @returns a promise that resolves when the engine is ready to use the glslang and tintWASM
+     */
+    prepareGlslangAndTintAsync(): Promise<void>;
     /**
      * Initializes the WebGPU context and dependencies.
      * @param glslangOptions Defines the GLSLang compiler options if necessary
@@ -445,7 +449,7 @@ export declare class WebGPUEngine extends AbstractEngine {
     /**
      * @internal
      */
-    _getShaderProcessingContext(shaderLanguage: ShaderLanguage): Nullable<ShaderProcessingContext>;
+    _getShaderProcessingContext(shaderLanguage: ShaderLanguage, pureMode: boolean): Nullable<ShaderProcessingContext>;
     private _currentPassIsMainPass;
     private _getCurrentRenderPass;
     /** @internal */
@@ -666,7 +670,7 @@ export declare class WebGPUEngine extends AbstractEngine {
     /**
      * @internal
      */
-    _preparePipelineContext(pipelineContext: IPipelineContext, vertexSourceCode: string, fragmentSourceCode: string, createAsRaw: boolean, rawVertexSourceCode: string, rawFragmentSourceCode: string, rebuildRebind: any, defines: Nullable<string>): void;
+    _preparePipelineContext(pipelineContext: IPipelineContext, vertexSourceCode: string, fragmentSourceCode: string, createAsRaw: boolean, rawVertexSourceCode: string, rawFragmentSourceCode: string, _rebuildRebind: any, defines: Nullable<string>, _transformFeedbackVaryings: Nullable<string[]>, _key: string, onReady: () => void): Promise<void>;
     /**
      * Gets the list of active attributes for a given WebGPU program
      * @param pipelineContext defines the pipeline context to use

package/Engines/webgpuEngine.js

@@ -351,6 +351,10 @@ export class WebGPUEngine extends AbstractEngine {
          */
         this.hasOriginBottomLeft = false;
         //------------------------------------------------------------------------------
+        //                              Initialization
+        //------------------------------------------------------------------------------
+        this._workingGlslangAndTintPromise = null;
+        //------------------------------------------------------------------------------
         //                              Dynamic WebGPU States
         //------------------------------------------------------------------------------
         // index 0 is for main render pass, 1 for RTT render pass
@@ -382,9 +386,24 @@ export class WebGPUEngine extends AbstractEngine {
         this._shaderProcessor = new WebGPUShaderProcessorGLSL();
         this._shaderProcessorWGSL = new WebGPUShaderProcessorWGSL();
     }
-    //------------------------------------------------------------------------------
-    //                              Initialization
-    //------------------------------------------------------------------------------
+    /**
+     * Load the glslang and tintWASM libraries and prepare them for use.
+     * @returns a promise that resolves when the engine is ready to use the glslang and tintWASM
+     */
+    prepareGlslangAndTintAsync() {
+        if (!this._workingGlslangAndTintPromise) {
+            this._workingGlslangAndTintPromise = new Promise((resolve) => {
+                this._initGlslang(this._glslangOptions ?? this._options?.glslangOptions).then((glslang) => {
+                    this._glslang = glslang;
+                    this._tintWASM = new WebGPUTintWASM();
+                    this._tintWASM.initTwgsl(this._twgslOptions ?? this._options?.twgslOptions).then(() => {
+                        resolve();
+                    });
+                });
+            });
+        }
+        return this._workingGlslangAndTintPromise;
+    }
     /**
      * Initializes the WebGPU context and dependencies.
      * @param glslangOptions Defines the GLSLang compiler options if necessary
@@ -395,16 +414,8 @@ export class WebGPUEngine extends AbstractEngine {
         this.uniqueId = WebGPUEngine._InstanceId++;
         this._glslangOptions = glslangOptions;
         this._twgslOptions = twgslOptions;
-        return this._initGlslang(glslangOptions ?? this._options?.glslangOptions)
-            .then((glslang) => {
-            this._glslang = glslang;
-            this._tintWASM = WebGPUEngine.UseTWGSL ? new WebGPUTintWASM() : null;
-            return this._tintWASM
-                ? this._tintWASM.initTwgsl(twgslOptions ?? this._options?.twgslOptions).then(() => {
-                    return navigator.gpu.requestAdapter(this._options);
-                })
-                : navigator.gpu.requestAdapter(this._options);
-        })
+        return navigator
+            .gpu.requestAdapter(this._options)
             .then((adapter) => {
             if (!adapter) {
                 // eslint-disable-next-line no-throw-literal
@@ -486,8 +497,9 @@ export class WebGPUEngine extends AbstractEngine {
             }
         })
             .then(() => {
+            this._initializeLimits();
             this._bufferManager = new WebGPUBufferManager(this, this._device);
-            this._textureHelper = new WebGPUTextureManager(this, this._device, this._glslang, this._tintWASM, this._bufferManager, this._deviceEnabledExtensions);
+            this._textureHelper = new WebGPUTextureManager(this, this._device, this._bufferManager, this._deviceEnabledExtensions);
             this._cacheSampler = new WebGPUCacheSampler(this._device);
             this._cacheBindGroups = new WebGPUCacheBindGroups(this._device, this._cacheSampler, this);
             this._timestampQuery = new WebGPUTimestampQuery(this, this._device, this._bufferManager);
@@ -504,7 +516,6 @@ export class WebGPUEngine extends AbstractEngine {
             }
             this._uploadEncoder = this._device.createCommandEncoder(this._uploadEncoderDescriptor);
             this._renderEncoder = this._device.createCommandEncoder(this._renderEncoderDescriptor);
-            this._initializeLimits();
             this._emptyVertexBuffer = new VertexBuffer(this, [0], "", {
                 stride: 1,
                 offset: 0,
@@ -536,7 +547,7 @@ export class WebGPUEngine extends AbstractEngine {
     _initGlslang(glslangOptions) {
         glslangOptions = glslangOptions || {};
         glslangOptions = {
-            ...WebGPUEngine._GLSLslangDefaultOptions,
+            ...WebGPUEngine._GlslangDefaultOptions,
             ...glslangOptions,
         };
         if (glslangOptions.glslang) {
@@ -901,8 +912,8 @@ export class WebGPUEngine extends AbstractEngine {
     /**
      * @internal
      */
-    _getShaderProcessingContext(shaderLanguage) {
-        return new WebGPUShaderProcessingContext(shaderLanguage);
+    _getShaderProcessingContext(shaderLanguage, pureMode) {
+        return new WebGPUShaderProcessingContext(shaderLanguage, pureMode);
     }
     _currentPassIsMainPass() {
         return this._currentRenderTarget === null;
@@ -1598,9 +1609,12 @@ export class WebGPUEngine extends AbstractEngine {
     /**
      * @internal
      */
-    _preparePipelineContext(pipelineContext, vertexSourceCode, fragmentSourceCode, createAsRaw, rawVertexSourceCode, rawFragmentSourceCode, rebuildRebind, defines) {
+    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)) {
+            await this.prepareGlslangAndTintAsync();
+        }
         if (this.dbgShowShaderCode) {
             Logger.Log(["defines", defines]);
             Logger.Log(vertexSourceCode);
@@ -1619,6 +1633,7 @@ export class WebGPUEngine extends AbstractEngine {
         else {
             webGpuContext.stages = this._compilePipelineStageDescriptor(vertexSourceCode, fragmentSourceCode, defines, shaderLanguage);
         }
+        onReady();
     }
     /**
      * Gets the list of active attributes for a given WebGPU program
@@ -3175,11 +3190,9 @@ export class WebGPUEngine extends AbstractEngine {
     }
 }
 // Default glslang options.
-WebGPUEngine._GLSLslangDefaultOptions = {
+WebGPUEngine._GlslangDefaultOptions = {
     jsPath: `${Tools._DefaultCdnUrl}/glslang/glslang.js`,
     wasmPath: `${Tools._DefaultCdnUrl}/glslang/glslang.wasm`,
 };
 WebGPUEngine._InstanceId = 0;
-/** true to enable using TintWASM to convert Spir-V to WGSL */
-WebGPUEngine.UseTWGSL = true;
 //# sourceMappingURL=webgpuEngine.js.map