@babylonjs/core 5.0.0-alpha.60 → 5.0.0-alpha.61

package/Engines/webgpuEngine.d.ts

@@ -22,6 +22,7 @@ import { DrawWrapper } from "../Materials/drawWrapper";
 import { WebGPUMaterialContext } from "./WebGPU/webgpuMaterialContext";
 import { WebGPUDrawContext } from "./WebGPU/webgpuDrawContext";
 import { IStencilState } from "../States/IStencilState";
+import { WebGPUBundleList } from "./WebGPU/webgpuBundleList";
 import { WebGPUTimestampQuery } from "./WebGPU/webgpuTimestampQuery";
 import { ComputeEffect } from "../Compute/computeEffect";
 import { WebGPUOcclusionQuery } from "./WebGPU/webgpuOcclusionQuery";
@@ -234,8 +235,10 @@ export declare class WebGPUEngine extends Engine {
     _rttRenderPassWrapper: WebGPURenderPassWrapper;
     /** @hidden */
     _pendingDebugCommands: Array<[string, Nullable<string>]>;
-    private _bundleList;
-    private _bundleListRenderTarget;
+    /** @hidden */
+    _bundleList: WebGPUBundleList;
+    /** @hidden */
+    _bundleListRenderTarget: WebGPUBundleList;
     /** @hidden */
     _onAfterUnbindFrameBufferObservable: Observable<WebGPUEngine>;
     private _defaultDrawContext;
@@ -260,10 +263,7 @@ export declare class WebGPUEngine extends Engine {
     dbgLogIfNotDrawWrapper: boolean;
     /** @hidden */
     dbgShowEmptyEnableEffectCalls: boolean;
-    private _snapshotRenderingRecordBundles;
-    private _snapshotRenderingPlayBundles;
-    private _snapshotRenderingMainPassBundleList;
-    private _snapshotRenderingModeSaved;
+    private _snapshotRendering;
     /**
      * Gets or sets the snapshot rendering mode
      */

package/Engines/webgpuEngine.js

@@ -34,6 +34,7 @@ import { ShaderCodeInliner } from "./Processors/shaderCodeInliner.js";
 import { WebGPUTintWASM } from "./WebGPU/webgpuTintWASM.js";
 import { WebGPUShaderProcessor } from "./WebGPU/webgpuShaderProcessor.js";
 import { ShaderLanguage } from "../Materials/shaderLanguage.js";
+import { WebGPUSnapshotRendering } from "./WebGPU/webgpuSnapshotRendering.js";
 /**
  * The web GPU engine class provides support for WebGPU version of babylon.js.
  * @since 5.0.0
@@ -114,9 +115,6 @@ var WebGPUEngine = /** @class */ (function (_super) {
         _this.dbgLogIfNotDrawWrapper = true;
         /** @hidden */
         _this.dbgShowEmptyEnableEffectCalls = true;
-        _this._snapshotRenderingRecordBundles = false;
-        _this._snapshotRenderingPlayBundles = false;
-        _this._snapshotRenderingMainPassBundleList = [];
         //------------------------------------------------------------------------------
         //                              Dynamic WebGPU States
         //------------------------------------------------------------------------------
@@ -179,15 +177,10 @@ var WebGPUEngine = /** @class */ (function (_super) {
          * Gets or sets the snapshot rendering mode
          */
         get: function () {
-            return this._snapshotRenderingMode;
+            return this._snapshotRendering.mode;
         },
         set: function (mode) {
-            if (this._snapshotRenderingRecordBundles) {
-                this._snapshotRenderingModeSaved = mode;
-            }
-            else {
-                this._snapshotRenderingMode = mode;
-            }
+            this._snapshotRendering.mode = mode;
         },
         enumerable: false,
         configurable: true
@@ -196,8 +189,7 @@ var WebGPUEngine = /** @class */ (function (_super) {
      * Creates a new snapshot at the next frame using the current snapshotRenderingMode
      */
     WebGPUEngine.prototype.snapshotRenderingReset = function () {
-        this.snapshotRendering = false;
-        this.snapshotRendering = true;
+        this._snapshotRendering.reset();
     };
     Object.defineProperty(WebGPUEngine.prototype, "snapshotRendering", {
         /**
@@ -205,16 +197,10 @@ var WebGPUEngine = /** @class */ (function (_super) {
          * Note that the WebGL engine does not support snapshot rendering so setting the value won't have any effect for this engine
          */
         get: function () {
-            return this._snapshotRenderingEnabled;
+            return this._snapshotRendering.enabled;
         },
         set: function (activate) {
-            this._snapshotRenderingMainPassBundleList.length = 0;
-            this._snapshotRenderingRecordBundles = this._snapshotRenderingEnabled = activate;
-            this._snapshotRenderingPlayBundles = false;
-            if (activate) {
-                this._snapshotRenderingModeSaved = this._snapshotRenderingMode;
-                this._snapshotRenderingMode = 0; // need to reset to standard for the recording pass to avoid some code being bypassed
-            }
+            this._snapshotRendering.enabled = activate;
         },
         enumerable: false,
         configurable: true
@@ -480,6 +466,7 @@ var WebGPUEngine = /** @class */ (function (_super) {
             _this._occlusionQuery = _this._device.createQuerySet ? new WebGPUOcclusionQuery(_this, _this._device, _this._bufferManager) : undefined;
             _this._bundleList = new WebGPUBundleList(_this._device);
             _this._bundleListRenderTarget = new WebGPUBundleList(_this._device);
+            _this._snapshotRendering = new WebGPUSnapshotRendering(_this, _this._snapshotRenderingMode, _this._bundleList, _this._bundleListRenderTarget);
             if (_this.dbgVerboseLogsForFirstFrames) {
                 if (_this._count === undefined) {
                     _this._count = 0;
@@ -612,6 +599,7 @@ var WebGPUEngine = /** @class */ (function (_super) {
             useUBOBindingCache: false,
             needShaderCodeInlining: true,
             needToAlwaysBindUniformBuffers: true,
+            supportRenderPasses: true,
             _collectUbosUpdatedInFrame: false,
         };
     };
@@ -1344,7 +1332,8 @@ var WebGPUEngine = /** @class */ (function (_super) {
         }
         else if (!effect.effect || effect.effect === this._currentEffect && effect.materialContext === this._currentMaterialContext && effect.drawContext === this._currentDrawContext && !this._forceEnableEffect) {
             if (!effect.effect && this.dbgShowEmptyEnableEffectCalls) {
-                console.warn("Invalid call to enableEffect: the effect property is empty! drawWrapper=", effect);
+                console.error("drawWrapper=", effect);
+                throw "Invalid call to enableEffect: the effect property is empty!";
             }
             return;
         }
@@ -1745,9 +1734,8 @@ var WebGPUEngine = /** @class */ (function (_super) {
     };
     /** @hidden */
     WebGPUEngine.prototype._generateMipmaps = function (texture, commandEncoder) {
-        var _a;
-        var gpuTexture = (_a = texture._hardwareTexture) === null || _a === void 0 ? void 0 : _a.underlyingResource;
-        if (!gpuTexture) {
+        var gpuHardwareTexture = texture._hardwareTexture;
+        if (!gpuHardwareTexture) {
             return;
         }
         // try as much as possible to use the command encoder corresponding to the current pass.
@@ -1764,10 +1752,10 @@ var WebGPUEngine = /** @class */ (function (_super) {
             }
         }
         if (texture.isCube) {
-            this._textureHelper.generateCubeMipmaps(gpuTexture, format, mipmapCount, commandEncoder);
+            this._textureHelper.generateCubeMipmaps(gpuHardwareTexture, format, mipmapCount, commandEncoder);
         }
         else {
-            this._textureHelper.generateMipmaps(gpuTexture, format, mipmapCount, 0, commandEncoder);
+            this._textureHelper.generateMipmaps(gpuHardwareTexture, format, mipmapCount, 0, commandEncoder);
         }
     };
     /**
@@ -1882,20 +1870,7 @@ var WebGPUEngine = /** @class */ (function (_super) {
      * End the current frame
      */
     WebGPUEngine.prototype.endFrame = function () {
-        if (this._snapshotRenderingRecordBundles) {
-            this._snapshotRenderingMainPassBundleList.push(this._bundleList.clone());
-            this._snapshotRenderingRecordBundles = false;
-            this._snapshotRenderingPlayBundles = true;
-            this._snapshotRenderingMode = this._snapshotRenderingModeSaved;
-        }
-        if (this._mainRenderPassWrapper.renderPass !== null && this._snapshotRenderingPlayBundles) {
-            for (var i = 0; i < this._snapshotRenderingMainPassBundleList.length; ++i) {
-                this._snapshotRenderingMainPassBundleList[i].run(this._mainRenderPassWrapper.renderPass);
-                if (this._snapshotRenderingMode === 1) {
-                    this._reportDrawCall(this._snapshotRenderingMainPassBundleList[i].numDrawCalls);
-                }
-            }
-        }
+        this._snapshotRendering.endFrame(this._mainRenderPassWrapper.renderPass);
         this._endMainRenderPass();
         this._timestampQuery.endFrame(this._renderEncoder);
         if (this._invertYFinalFramebuffer) {
@@ -2098,24 +2073,10 @@ var WebGPUEngine = /** @class */ (function (_super) {
     };
     /** @hidden */
     WebGPUEngine.prototype._endRenderTargetRenderPass = function () {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c;
         if (this._currentRenderPass) {
             var gpuWrapper = this._currentRenderTarget.texture._hardwareTexture;
-            if (this._snapshotRenderingPlayBundles) {
-                (_b = (_a = gpuWrapper._bundleLists) === null || _a === void 0 ? void 0 : _a[gpuWrapper._currentLayer]) === null || _b === void 0 ? void 0 : _b.run(this._currentRenderPass);
-                if (this._snapshotRenderingMode === 1) {
-                    this._reportDrawCall((_d = (_c = gpuWrapper._bundleLists) === null || _c === void 0 ? void 0 : _c[gpuWrapper._currentLayer]) === null || _d === void 0 ? void 0 : _d.numDrawCalls);
-                }
-            }
-            else if (this._snapshotRenderingRecordBundles) {
-                if (!gpuWrapper._bundleLists) {
-                    gpuWrapper._bundleLists = [];
-                }
-                gpuWrapper._bundleLists[gpuWrapper._currentLayer] = this._bundleListRenderTarget.clone();
-                gpuWrapper._bundleLists[gpuWrapper._currentLayer].run(this._currentRenderPass);
-                this._bundleListRenderTarget.reset();
-            }
-            else if (!this.compatibilityMode) {
+            if (!this._snapshotRendering.endRenderTargetPass(this._currentRenderPass, gpuWrapper) && !this.compatibilityMode) {
                 this._bundleListRenderTarget.run(this._currentRenderPass);
                 this._bundleListRenderTarget.reset();
             }
@@ -2125,10 +2086,10 @@ var WebGPUEngine = /** @class */ (function (_super) {
                     this._count = 0;
                 }
                 if (!this._count || this._count < this.dbgVerboseLogsNumFrames) {
-                    console.log("frame #" + this._count + " - render target end pass - internalTexture.uniqueId=", (_f = (_e = this._currentRenderTarget) === null || _e === void 0 ? void 0 : _e.texture) === null || _f === void 0 ? void 0 : _f.uniqueId);
+                    console.log("frame #" + this._count + " - render target end pass - internalTexture.uniqueId=", (_b = (_a = this._currentRenderTarget) === null || _a === void 0 ? void 0 : _a.texture) === null || _b === void 0 ? void 0 : _b.uniqueId);
                 }
             }
-            (_g = this._debugPopGroup) === null || _g === void 0 ? void 0 : _g.call(this, 1);
+            (_c = this._debugPopGroup) === null || _c === void 0 ? void 0 : _c.call(this, 1);
             this._resetCurrentViewport(1);
             this._resetCurrentScissor(1);
             this._resetCurrentStencilRef(1);
@@ -2201,10 +2162,8 @@ var WebGPUEngine = /** @class */ (function (_super) {
     WebGPUEngine.prototype._endMainRenderPass = function () {
         var _a;
         if (this._mainRenderPassWrapper.renderPass !== null) {
-            if (this._snapshotRenderingRecordBundles) {
-                this._snapshotRenderingMainPassBundleList.push(this._bundleList.clone());
-            }
-            if (!this.compatibilityMode && !this._snapshotRenderingPlayBundles) {
+            this._snapshotRendering.endMainRenderPass();
+            if (!this.compatibilityMode && !this._snapshotRendering.play) {
                 this._bundleList.run(this._mainRenderPassWrapper.renderPass);
                 this._bundleList.reset();
             }
@@ -2473,7 +2432,7 @@ var WebGPUEngine = /** @class */ (function (_super) {
             webgpuPipelineContext.uniformBuffer.update();
             this.bindUniformBufferBase(webgpuPipelineContext.uniformBuffer.getBuffer(), 0, WebGPUShaderProcessor.LeftOvertUBOName);
         }
-        if (this._snapshotRenderingPlayBundles) {
+        if (this._snapshotRendering.play) {
             this._reportDrawCall();
             return;
         }
@@ -2482,9 +2441,9 @@ var WebGPUEngine = /** @class */ (function (_super) {
         }
         var useFastPath = !this.compatibilityMode && this._currentDrawContext.fastBundle;
         var renderPass2 = renderPass;
-        if (useFastPath || this._snapshotRenderingRecordBundles) {
+        if (useFastPath || this._snapshotRendering.record) {
             this._applyRenderPassChanges(renderPass, bundleList);
-            if (!this._snapshotRenderingRecordBundles) {
+            if (!this._snapshotRendering.record) {
                 this._counters.numBundleReuseNonCompatMode++;
                 if (this._currentDrawContext.indirectDrawBuffer) {
                     this._currentDrawContext.setIndirectData(count, instancesCount || 1, start);
@@ -2510,7 +2469,7 @@ var WebGPUEngine = /** @class */ (function (_super) {
         }
         var pipeline = this._cacheRenderPipeline.getRenderPipeline(fillMode, this._currentEffect, this.currentSampleCount, textureState);
         var bindGroups = this._cacheBindGroups.getBindGroups(webgpuPipelineContext, this._currentDrawContext, this._currentMaterialContext);
-        if (!this._snapshotRenderingRecordBundles) {
+        if (!this._snapshotRendering.record) {
             this._applyRenderPassChanges(renderPass, !this.compatibilityMode ? bundleList : null);
             if (!this.compatibilityMode) {
                 this._counters.numBundleCreationNonCompatMode++;
@@ -2540,7 +2499,7 @@ var WebGPUEngine = /** @class */ (function (_super) {
             renderPass2.setBindGroup(i, bindGroups[i]);
         }
         // draw
-        var nonCompatMode = !this.compatibilityMode && !this._snapshotRenderingRecordBundles;
+        var nonCompatMode = !this.compatibilityMode && !this._snapshotRendering.record;
         if (nonCompatMode && this._currentDrawContext.indirectDrawBuffer) {
             this._currentDrawContext.setIndirectData(count, instancesCount || 1, start);
             if (drawType === 0) {