@onerjs/core 8.42.5 → 8.42.7

package/Engines/thinWebGPUEngine.d.ts

@@ -17,14 +17,10 @@ export declare abstract class ThinWebGPUEngine extends AbstractEngine {
     /** @internal */
     dbgSanityChecks: boolean;
     /** @internal */
-    dbgVerboseLogsNumFrames: number;
-    /** @internal */
     dbgLogIfNotDrawWrapper: boolean;
     /** @internal */
     dbgShowEmptyEnableEffectCalls: boolean;
     /** @internal */
-    dbgVerboseLogsForFirstFrames: boolean;
-    /** @internal */
     _textureHelper: WebGPUTextureManager;
     /** @internal */
     _cacheRenderPipeline: WebGPUCacheRenderPipeline;
@@ -42,6 +38,14 @@ export declare abstract class ThinWebGPUEngine extends AbstractEngine {
     _timestampQuery: WebGPUTimestampQuery;
     /** @internal */
     _timestampIndex: number;
+    /** @internal */
+    _showGPUDebugMarkersLog: boolean;
+    /** @internal */
+    _debugStackRenderEncoder: string[];
+    /** @internal */
+    _debugStackRenderPass: string[];
+    /** @internal */
+    _debugNumPopPending: number;
     /**
      * Gets the GPU time spent in the main render pass for the last frame rendered (in nanoseconds).
      * You have to enable the "timestamp-query" extension in the engine constructor options and set engine.enableGPUTimingMeasurements = true.
@@ -66,4 +70,5 @@ export declare abstract class ThinWebGPUEngine extends AbstractEngine {
      * @internal
      */
     _generateMipmaps(texture: InternalTexture, commandEncoder?: GPUCommandEncoder): void;
+    protected _debugPushPendingGroups(forRenderPass: boolean): void;
 }

package/Engines/thinWebGPUEngine.js

@@ -15,18 +15,22 @@ export class ThinWebGPUEngine extends AbstractEngine {
         /** @internal */
         this.dbgSanityChecks = true;
         /** @internal */
-        this.dbgVerboseLogsNumFrames = 10;
-        /** @internal */
         this.dbgLogIfNotDrawWrapper = true;
         /** @internal */
         this.dbgShowEmptyEnableEffectCalls = true;
         /** @internal */
-        this.dbgVerboseLogsForFirstFrames = false;
-        /** @internal */
         this._currentRenderPass = null;
         this._snapshotRenderingMode = 0;
         /** @internal */
         this._timestampIndex = 0;
+        /** @internal */
+        this._showGPUDebugMarkersLog = false;
+        /** @internal */
+        this._debugStackRenderEncoder = [];
+        /** @internal */
+        this._debugStackRenderPass = [];
+        /** @internal */
+        this._debugNumPopPending = 0;
     }
     /**
      * Enables or disables GPU timing measurements.
@@ -50,6 +54,13 @@ export class ThinWebGPUEngine extends AbstractEngine {
         if (!this._currentRenderPass) {
             return 0;
         }
+        if (this._debugStackRenderPass.length !== 0) {
+            // We have pushed debug groups without popping them, we need to pop them before ending the render pass to avoid WebGPU validation errors
+            // We will re-push them after starting the new render pass (if any)
+            for (let i = 0; i < this._debugStackRenderPass.length; ++i) {
+                this._currentRenderPass.popDebugGroup();
+            }
+        }
         const currentPassIndex = this._currentPassIsMainPass() ? 2 : 1;
         if (!this._snapshotRendering.endRenderPass(this._currentRenderPass) && !this.compatibilityMode) {
             this._bundleList.run(this._currentRenderPass);
@@ -60,20 +71,16 @@ export class ThinWebGPUEngine extends AbstractEngine {
             ? this._currentRenderTarget.gpuTimeInFrame
             : this.gpuTimeInFrameForMainPass));
         this._timestampIndex += 2;
-        if (this.dbgVerboseLogsForFirstFrames) {
-            if (this._count === undefined) {
-                this._count = 0;
-            }
-            if (!this._count || this._count < this.dbgVerboseLogsNumFrames) {
-                Logger.Log("frame #" +
-                    this._count +
-                    " - " +
-                    (currentPassIndex === 2 ? "main" : "render target") +
-                    " end pass" +
-                    (currentPassIndex === 1 ? " - internalTexture.uniqueId=" + this._currentRenderTarget?.texture?.uniqueId : ""));
+        // Pop all pending debug groups that couldn't be popped while the render pass was active
+        while (this._debugNumPopPending-- > 0) {
+            if (this._showGPUDebugMarkersLog) {
+                Logger.Log(`[${this.frameId}] Re-popping pending debug group on render encoder '${this._renderEncoder.label}' after ending current render pass '${this._currentRenderPass.label}'`);
             }
+            this._renderEncoder.popDebugGroup();
+            this._debugStackRenderEncoder.pop();
         }
         this._currentRenderPass = null;
+        this._debugNumPopPending = 0;
         return currentPassIndex;
     }
     /**
@@ -90,23 +97,6 @@ export class ThinWebGPUEngine extends AbstractEngine {
             this._endCurrentRenderPass();
         }
         const mipmapCount = WebGPUTextureHelper.ComputeNumMipmapLevels(texture.width, texture.height);
-        if (this.dbgVerboseLogsForFirstFrames) {
-            if (this._count === undefined) {
-                this._count = 0;
-            }
-            if (!this._count || this._count < this.dbgVerboseLogsNumFrames) {
-                Logger.Log("frame #" +
-                    this._count +
-                    " - generate mipmaps - width=" +
-                    texture.width +
-                    ", height=" +
-                    texture.height +
-                    ", isCube=" +
-                    texture.isCube +
-                    ", command encoder=" +
-                    (commandEncoder === this._renderEncoder ? "render" : "copy"));
-            }
-        }
         if (texture.isCube) {
             this._textureHelper.generateCubeMipmaps(gpuHardwareTexture, mipmapCount, commandEncoder);
         }
@@ -117,5 +107,15 @@ export class ThinWebGPUEngine extends AbstractEngine {
             this._textureHelper.generateMipmaps(gpuHardwareTexture, mipmapCount, 0, commandEncoder);
         }
     }
+    _debugPushPendingGroups(forRenderPass) {
+        const debugStack = forRenderPass ? this._debugStackRenderPass : this._debugStackRenderEncoder;
+        const currentEncoder = forRenderPass ? this._currentRenderPass : this._renderEncoder;
+        for (const groupName of debugStack) {
+            if (this._showGPUDebugMarkersLog) {
+                Logger.Log(`[${this.frameId}] Re-pushing debug group '${groupName}' on ${forRenderPass ? "current render pass '" + this._currentRenderPass?.label + "'" : "render encoder '" + this._renderEncoder.label + "'"} after starting a new ${forRenderPass ? "render pass" : "render encoder"}`);
+            }
+            currentEncoder.pushDebugGroup(groupName);
+        }
+    }
 }
 //# sourceMappingURL=thinWebGPUEngine.js.map

package/Engines/thinWebGPUEngine.js.map

@@ -1 +1 @@
-{"version":3,"file":"thinWebGPUEngine.js","sourceRoot":"","sources":["../../../../dev/core/src/Engines/thinWebGPUEngine.ts"],"names":[],"mappings":"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","sourcesContent":["import type { InternalTexture } from \"core/Materials/Textures/internalTexture\";\r\nimport { InternalTextureSource } from \"core/Materials/Textures/internalTexture\";\r\nimport { AbstractEngine } from \"./abstractEngine\";\r\nimport type { WebGPUCacheRenderPipeline } from \"./WebGPU/webgpuCacheRenderPipeline\";\r\nimport type { WebGPUTextureManager } from \"./WebGPU/webgpuTextureManager\";\r\nimport type { WebGPUHardwareTexture } from \"./WebGPU/webgpuHardwareTexture\";\r\nimport type { Nullable } from \"core/types\";\r\nimport { Logger } from \"core/Misc/logger\";\r\nimport { WebGPUTextureHelper } from \"./WebGPU/webgpuTextureHelper\";\r\nimport type { WebGPURenderTargetWrapper } from \"./WebGPU/webgpuRenderTargetWrapper\";\r\nimport { WebGPUPerfCounter } from \"./WebGPU/webgpuPerfCounter\";\r\nimport type { WebGPUSnapshotRendering } from \"./WebGPU/webgpuSnapshotRendering\";\r\nimport { Constants } from \"./constants\";\r\nimport type { WebGPUBundleList } from \"./WebGPU/webgpuBundleList\";\r\nimport type { WebGPUTimestampQuery } from \"./WebGPU/webgpuTimestampQuery\";\r\nimport type { WebGPUOcclusionQuery } from \"./WebGPU/webgpuOcclusionQuery\";\r\n\r\n/**\r\n * The base engine class for WebGPU\r\n */\r\nexport abstract class ThinWebGPUEngine extends AbstractEngine {\r\n    // TODO WEBGPU remove those variables when code stabilized\r\n    /** @internal */\r\n    public dbgShowShaderCode = false;\r\n    /** @internal */\r\n    public dbgSanityChecks = true;\r\n    /** @internal */\r\n    public dbgVerboseLogsNumFrames = 10;\r\n    /** @internal */\r\n    public dbgLogIfNotDrawWrapper = true;\r\n    /** @internal */\r\n    public dbgShowEmptyEnableEffectCalls = true;\r\n    /** @internal */\r\n    public dbgVerboseLogsForFirstFrames = false;\r\n\r\n    /** @internal */\r\n    public _textureHelper: WebGPUTextureManager;\r\n    /** @internal */\r\n    public _cacheRenderPipeline: WebGPUCacheRenderPipeline;\r\n    /** @internal */\r\n    public _occlusionQuery: WebGPUOcclusionQuery;\r\n\r\n    // Frame Life Cycle (recreated each frame)\r\n    /** @internal */\r\n    public _renderEncoder: GPUCommandEncoder;\r\n    /** @internal */\r\n    public _uploadEncoder: GPUCommandEncoder;\r\n\r\n    /** @internal */\r\n    public _currentRenderPass: Nullable<GPURenderPassEncoder> = null;\r\n\r\n    protected _snapshotRendering: WebGPUSnapshotRendering;\r\n    protected _snapshotRenderingMode = Constants.SNAPSHOTRENDERING_STANDARD;\r\n\r\n    /** @internal */\r\n    public _timestampQuery: WebGPUTimestampQuery;\r\n    /** @internal */\r\n    public _timestampIndex = 0;\r\n\r\n    /**\r\n     * Gets the GPU time spent in the main render pass for the last frame rendered (in nanoseconds).\r\n     * You have to enable the \"timestamp-query\" extension in the engine constructor options and set engine.enableGPUTimingMeasurements = true.\r\n     * It will only return time spent in the main pass, not additional render target / compute passes (if any)!\r\n     */\r\n    public readonly gpuTimeInFrameForMainPass?: WebGPUPerfCounter;\r\n\r\n    /**\r\n     * Used for both the compatibilityMode=false and the snapshot rendering modes (as both can't be enabled at the same time)\r\n     * @internal\r\n     */\r\n    public _bundleList: WebGPUBundleList;\r\n\r\n    /**\r\n     * Enables or disables GPU timing measurements.\r\n     * Note that this is only supported if the \"timestamp-query\" extension is enabled in the options.\r\n     */\r\n    public get enableGPUTimingMeasurements(): boolean {\r\n        return this._timestampQuery.enable;\r\n    }\r\n\r\n    public set enableGPUTimingMeasurements(enable: boolean) {\r\n        if (this._timestampQuery.enable === enable) {\r\n            return;\r\n        }\r\n        (this.gpuTimeInFrameForMainPass as any) = enable ? new WebGPUPerfCounter() : undefined;\r\n        this._timestampQuery.enable = enable;\r\n    }\r\n\r\n    protected _currentPassIsMainPass() {\r\n        return this._currentRenderTarget === null;\r\n    }\r\n\r\n    /** @internal */\r\n    public _endCurrentRenderPass(): number {\r\n        if (!this._currentRenderPass) {\r\n            return 0;\r\n        }\r\n\r\n        const currentPassIndex = this._currentPassIsMainPass() ? 2 : 1;\r\n\r\n        if (!this._snapshotRendering.endRenderPass(this._currentRenderPass) && !this.compatibilityMode) {\r\n            this._bundleList.run(this._currentRenderPass);\r\n            this._bundleList.reset();\r\n        }\r\n        this._currentRenderPass.end();\r\n\r\n        this._timestampQuery.endPass(\r\n            this._timestampIndex,\r\n            (this._currentRenderTarget && (this._currentRenderTarget as WebGPURenderTargetWrapper).gpuTimeInFrame\r\n                ? (this._currentRenderTarget as WebGPURenderTargetWrapper).gpuTimeInFrame\r\n                : this.gpuTimeInFrameForMainPass) as WebGPUPerfCounter\r\n        );\r\n        this._timestampIndex += 2;\r\n\r\n        if (this.dbgVerboseLogsForFirstFrames) {\r\n            if ((this as any)._count === undefined) {\r\n                (this as any)._count = 0;\r\n            }\r\n            if (!(this as any)._count || (this as any)._count < this.dbgVerboseLogsNumFrames) {\r\n                Logger.Log(\r\n                    \"frame #\" +\r\n                        (this as any)._count +\r\n                        \" - \" +\r\n                        (currentPassIndex === 2 ? \"main\" : \"render target\") +\r\n                        \" end pass\" +\r\n                        (currentPassIndex === 1 ? \" - internalTexture.uniqueId=\" + this._currentRenderTarget?.texture?.uniqueId : \"\")\r\n                );\r\n            }\r\n        }\r\n        this._currentRenderPass = null;\r\n\r\n        return currentPassIndex;\r\n    }\r\n\r\n    /**\r\n     * @internal\r\n     */\r\n    public _generateMipmaps(texture: InternalTexture, commandEncoder?: GPUCommandEncoder) {\r\n        commandEncoder = commandEncoder ?? this._renderEncoder;\r\n\r\n        const gpuHardwareTexture = texture._hardwareTexture as Nullable<WebGPUHardwareTexture>;\r\n\r\n        if (!gpuHardwareTexture) {\r\n            return;\r\n        }\r\n\r\n        if (commandEncoder === this._renderEncoder) {\r\n            // We must close the current pass (if any) because we are going to use the render encoder to generate the mipmaps (so, we are going to create a new render pass)\r\n            this._endCurrentRenderPass();\r\n        }\r\n\r\n        const mipmapCount = WebGPUTextureHelper.ComputeNumMipmapLevels(texture.width, texture.height);\r\n\r\n        if (this.dbgVerboseLogsForFirstFrames) {\r\n            if ((this as any)._count === undefined) {\r\n                (this as any)._count = 0;\r\n            }\r\n            if (!(this as any)._count || (this as any)._count < this.dbgVerboseLogsNumFrames) {\r\n                Logger.Log(\r\n                    \"frame #\" +\r\n                        (this as any)._count +\r\n                        \" - generate mipmaps - width=\" +\r\n                        texture.width +\r\n                        \", height=\" +\r\n                        texture.height +\r\n                        \", isCube=\" +\r\n                        texture.isCube +\r\n                        \", command encoder=\" +\r\n                        (commandEncoder === this._renderEncoder ? \"render\" : \"copy\")\r\n                );\r\n            }\r\n        }\r\n\r\n        if (texture.isCube) {\r\n            this._textureHelper.generateCubeMipmaps(gpuHardwareTexture, mipmapCount, commandEncoder);\r\n        } else if (texture._source === InternalTextureSource.Raw || texture._source === InternalTextureSource.Raw2DArray) {\r\n            this._textureHelper.generateMipmaps(gpuHardwareTexture, texture.mipLevelCount, 0, commandEncoder);\r\n        } else {\r\n            this._textureHelper.generateMipmaps(gpuHardwareTexture, mipmapCount, 0, commandEncoder);\r\n        }\r\n    }\r\n}\r\n"]}
+{"version":3,"file":"thinWebGPUEngine.js","sourceRoot":"","sources":["../../../../dev/core/src/Engines/thinWebGPUEngine.ts"],"names":[],"mappings":"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","sourcesContent":["import type { InternalTexture } from \"core/Materials/Textures/internalTexture\";\r\nimport { InternalTextureSource } from \"core/Materials/Textures/internalTexture\";\r\nimport { AbstractEngine } from \"./abstractEngine\";\r\nimport type { WebGPUCacheRenderPipeline } from \"./WebGPU/webgpuCacheRenderPipeline\";\r\nimport type { WebGPUTextureManager } from \"./WebGPU/webgpuTextureManager\";\r\nimport type { WebGPUHardwareTexture } from \"./WebGPU/webgpuHardwareTexture\";\r\nimport type { Nullable } from \"core/types\";\r\nimport { Logger } from \"core/Misc/logger\";\r\nimport { WebGPUTextureHelper } from \"./WebGPU/webgpuTextureHelper\";\r\nimport type { WebGPURenderTargetWrapper } from \"./WebGPU/webgpuRenderTargetWrapper\";\r\nimport { WebGPUPerfCounter } from \"./WebGPU/webgpuPerfCounter\";\r\nimport type { WebGPUSnapshotRendering } from \"./WebGPU/webgpuSnapshotRendering\";\r\nimport { Constants } from \"./constants\";\r\nimport type { WebGPUBundleList } from \"./WebGPU/webgpuBundleList\";\r\nimport type { WebGPUTimestampQuery } from \"./WebGPU/webgpuTimestampQuery\";\r\nimport type { WebGPUOcclusionQuery } from \"./WebGPU/webgpuOcclusionQuery\";\r\n\r\n/**\r\n * The base engine class for WebGPU\r\n */\r\nexport abstract class ThinWebGPUEngine extends AbstractEngine {\r\n    // TODO WEBGPU remove those variables when code stabilized\r\n    /** @internal */\r\n    public dbgShowShaderCode = false;\r\n    /** @internal */\r\n    public dbgSanityChecks = true;\r\n    /** @internal */\r\n    public dbgLogIfNotDrawWrapper = true;\r\n    /** @internal */\r\n    public dbgShowEmptyEnableEffectCalls = true;\r\n\r\n    /** @internal */\r\n    public _textureHelper: WebGPUTextureManager;\r\n    /** @internal */\r\n    public _cacheRenderPipeline: WebGPUCacheRenderPipeline;\r\n    /** @internal */\r\n    public _occlusionQuery: WebGPUOcclusionQuery;\r\n\r\n    // Frame Life Cycle (recreated each frame)\r\n    /** @internal */\r\n    public _renderEncoder: GPUCommandEncoder;\r\n    /** @internal */\r\n    public _uploadEncoder: GPUCommandEncoder;\r\n\r\n    /** @internal */\r\n    public _currentRenderPass: Nullable<GPURenderPassEncoder> = null;\r\n\r\n    protected _snapshotRendering: WebGPUSnapshotRendering;\r\n    protected _snapshotRenderingMode = Constants.SNAPSHOTRENDERING_STANDARD;\r\n\r\n    /** @internal */\r\n    public _timestampQuery: WebGPUTimestampQuery;\r\n    /** @internal */\r\n    public _timestampIndex = 0;\r\n\r\n    /** @internal */\r\n    public _showGPUDebugMarkersLog = false;\r\n    /** @internal */\r\n    public _debugStackRenderEncoder: string[] = [];\r\n    /** @internal */\r\n    public _debugStackRenderPass: string[] = [];\r\n    /** @internal */\r\n    public _debugNumPopPending = 0;\r\n\r\n    /**\r\n     * Gets the GPU time spent in the main render pass for the last frame rendered (in nanoseconds).\r\n     * You have to enable the \"timestamp-query\" extension in the engine constructor options and set engine.enableGPUTimingMeasurements = true.\r\n     * It will only return time spent in the main pass, not additional render target / compute passes (if any)!\r\n     */\r\n    public readonly gpuTimeInFrameForMainPass?: WebGPUPerfCounter;\r\n\r\n    /**\r\n     * Used for both the compatibilityMode=false and the snapshot rendering modes (as both can't be enabled at the same time)\r\n     * @internal\r\n     */\r\n    public _bundleList: WebGPUBundleList;\r\n\r\n    /**\r\n     * Enables or disables GPU timing measurements.\r\n     * Note that this is only supported if the \"timestamp-query\" extension is enabled in the options.\r\n     */\r\n    public get enableGPUTimingMeasurements(): boolean {\r\n        return this._timestampQuery.enable;\r\n    }\r\n\r\n    public set enableGPUTimingMeasurements(enable: boolean) {\r\n        if (this._timestampQuery.enable === enable) {\r\n            return;\r\n        }\r\n        (this.gpuTimeInFrameForMainPass as any) = enable ? new WebGPUPerfCounter() : undefined;\r\n        this._timestampQuery.enable = enable;\r\n    }\r\n\r\n    protected _currentPassIsMainPass() {\r\n        return this._currentRenderTarget === null;\r\n    }\r\n\r\n    /** @internal */\r\n    public _endCurrentRenderPass(): number {\r\n        if (!this._currentRenderPass) {\r\n            return 0;\r\n        }\r\n\r\n        if (this._debugStackRenderPass.length !== 0) {\r\n            // We have pushed debug groups without popping them, we need to pop them before ending the render pass to avoid WebGPU validation errors\r\n            // We will re-push them after starting the new render pass (if any)\r\n            for (let i = 0; i < this._debugStackRenderPass.length; ++i) {\r\n                this._currentRenderPass.popDebugGroup();\r\n            }\r\n        }\r\n\r\n        const currentPassIndex = this._currentPassIsMainPass() ? 2 : 1;\r\n\r\n        if (!this._snapshotRendering.endRenderPass(this._currentRenderPass) && !this.compatibilityMode) {\r\n            this._bundleList.run(this._currentRenderPass);\r\n            this._bundleList.reset();\r\n        }\r\n        this._currentRenderPass.end();\r\n\r\n        this._timestampQuery.endPass(\r\n            this._timestampIndex,\r\n            (this._currentRenderTarget && (this._currentRenderTarget as WebGPURenderTargetWrapper).gpuTimeInFrame\r\n                ? (this._currentRenderTarget as WebGPURenderTargetWrapper).gpuTimeInFrame\r\n                : this.gpuTimeInFrameForMainPass) as WebGPUPerfCounter\r\n        );\r\n        this._timestampIndex += 2;\r\n\r\n        // Pop all pending debug groups that couldn't be popped while the render pass was active\r\n        while (this._debugNumPopPending-- > 0) {\r\n            if (this._showGPUDebugMarkersLog) {\r\n                Logger.Log(\r\n                    `[${this.frameId}] Re-popping pending debug group on render encoder '${this._renderEncoder.label}' after ending current render pass '${this._currentRenderPass.label}'`\r\n                );\r\n            }\r\n            this._renderEncoder.popDebugGroup();\r\n            this._debugStackRenderEncoder.pop();\r\n        }\r\n\r\n        this._currentRenderPass = null;\r\n        this._debugNumPopPending = 0;\r\n\r\n        return currentPassIndex;\r\n    }\r\n\r\n    /**\r\n     * @internal\r\n     */\r\n    public _generateMipmaps(texture: InternalTexture, commandEncoder?: GPUCommandEncoder) {\r\n        commandEncoder = commandEncoder ?? this._renderEncoder;\r\n\r\n        const gpuHardwareTexture = texture._hardwareTexture as Nullable<WebGPUHardwareTexture>;\r\n\r\n        if (!gpuHardwareTexture) {\r\n            return;\r\n        }\r\n\r\n        if (commandEncoder === this._renderEncoder) {\r\n            // We must close the current pass (if any) because we are going to use the render encoder to generate the mipmaps (so, we are going to create a new render pass)\r\n            this._endCurrentRenderPass();\r\n        }\r\n\r\n        const mipmapCount = WebGPUTextureHelper.ComputeNumMipmapLevels(texture.width, texture.height);\r\n\r\n        if (texture.isCube) {\r\n            this._textureHelper.generateCubeMipmaps(gpuHardwareTexture, mipmapCount, commandEncoder);\r\n        } else if (texture._source === InternalTextureSource.Raw || texture._source === InternalTextureSource.Raw2DArray) {\r\n            this._textureHelper.generateMipmaps(gpuHardwareTexture, texture.mipLevelCount, 0, commandEncoder);\r\n        } else {\r\n            this._textureHelper.generateMipmaps(gpuHardwareTexture, mipmapCount, 0, commandEncoder);\r\n        }\r\n    }\r\n\r\n    protected _debugPushPendingGroups(forRenderPass: boolean) {\r\n        const debugStack = forRenderPass ? this._debugStackRenderPass : this._debugStackRenderEncoder;\r\n        const currentEncoder = forRenderPass ? this._currentRenderPass : this._renderEncoder;\r\n\r\n        for (const groupName of debugStack) {\r\n            if (this._showGPUDebugMarkersLog) {\r\n                Logger.Log(\r\n                    `[${this.frameId}] Re-pushing debug group '${groupName}' on ${forRenderPass ? \"current render pass '\" + this._currentRenderPass?.label + \"'\" : \"render encoder '\" + this._renderEncoder.label + \"'\"} after starting a new ${forRenderPass ? \"render pass\" : \"render encoder\"}`\r\n                );\r\n            }\r\n            currentEncoder!.pushDebugGroup(groupName);\r\n        }\r\n    }\r\n}\r\n"]}

package/Engines/webgpuEngine.d.ts

@@ -222,6 +222,7 @@ export declare class WebGPUEngine extends ThinWebGPUEngine {
     private _dummyIndexBuffer;
     private _colorWriteLocal;
     private _forceEnableEffect;
+    private _internalFrameCounter;
     /**
      * Gets or sets the snapshot rendering mode
      */

package/Engines/webgpuEngine.js

@@ -18,7 +18,6 @@ import { WebGPUTextureManager } from "./WebGPU/webgpuTextureManager.js";
 import { AbstractEngine } from "./abstractEngine.js";
 import { WebGPUBufferManager } from "./WebGPU/webgpuBufferManager.js";
 import { WebGPUHardwareTexture } from "./WebGPU/webgpuHardwareTexture.js";
-import { UniformBuffer } from "../Materials/uniformBuffer.js";
 import { WebGPUCacheSampler } from "./WebGPU/webgpuCacheSampler.js";
 import { WebGPUCacheRenderPipelineTree } from "./WebGPU/webgpuCacheRenderPipelineTree.js";
 import { WebGPUStencilStateComposer } from "./WebGPU/webgpuStencilStateComposer.js";
@@ -328,6 +327,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         this._currentIndexBuffer = null;
         this._colorWriteLocal = true;
         this._forceEnableEffect = false;
+        this._internalFrameCounter = 0;
         /**
          * Indicates if the z range in NDC space is 0..1 (value: true) or -1..1 (value: false)
          */
@@ -507,12 +507,9 @@ export class WebGPUEngine extends ThinWebGPUEngine {
             this._snapshotRendering = new WebGPUSnapshotRendering(this, this._snapshotRenderingMode, this._bundleList);
             this._ubInvertY = this._bufferManager.createBuffer(new Float32Array([-1, 0]), WebGPUConstants.BufferUsage.Uniform | WebGPUConstants.BufferUsage.CopyDst, "UBInvertY");
             this._ubDontInvertY = this._bufferManager.createBuffer(new Float32Array([1, 0]), WebGPUConstants.BufferUsage.Uniform | WebGPUConstants.BufferUsage.CopyDst, "UBDontInvertY");
-            if (this.dbgVerboseLogsForFirstFrames) {
-                if (this._count === undefined) {
-                    this._count = 0;
-                    Logger.Log(["%c frame #" + this._count + " - begin", "background: #ffff00"]);
-                }
-            }
+            const frameCounter = this._internalFrameCounter++;
+            this._uploadEncoderDescriptor.label = `[${this.frameId}|${frameCounter}] - UploadEncoder`;
+            this._renderEncoderDescriptor.label = `[${this.frameId}|${frameCounter}] - RenderEncoder`;
             this._uploadEncoder = this._device.createCommandEncoder(this._uploadEncoderDescriptor);
             this._renderEncoder = this._device.createCommandEncoder(this._renderEncoderDescriptor);
             this._emptyVertexBuffer = new VertexBuffer(this, [0], "", {
@@ -656,7 +653,6 @@ export class WebGPUEngine extends ThinWebGPUEngine {
             supportSpriteInstancing: true,
             forceVertexBufferStrideAndOffsetMultiple4Bytes: true,
             _checkNonFloatVertexBuffersDontRecreatePipelineContext: true,
-            _collectUbosUpdatedInFrame: false,
         };
         this._alphaState = new AlphaState(this._caps.blendParametersPerTarget);
     }
@@ -757,8 +753,9 @@ export class WebGPUEngine extends ThinWebGPUEngine {
             stencilLoadOp: !this.isStencilEnable ? undefined : "clear" /* WebGPUConstants.LoadOp.Clear */,
             stencilStoreOp: !this.isStencilEnable ? undefined : "store" /* WebGPUConstants.StoreOp.Store */,
         };
+        const frameCounter = this._internalFrameCounter++;
         this._mainRenderPassWrapper.renderPassDescriptor = {
-            label: "MainRenderPass",
+            label: `[${this.frameId}|${frameCounter}] - MainRenderPass`,
             colorAttachments: mainColorAttachments,
             depthStencilAttachment: mainDepthAttachment,
         };
@@ -902,14 +899,6 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         if (!super.setSize(width, height, forceSetSize)) {
             return false;
         }
-        if (this.dbgVerboseLogsForFirstFrames) {
-            if (this._count === undefined) {
-                this._count = 0;
-            }
-            if (!this._count || this._count < this.dbgVerboseLogsNumFrames) {
-                Logger.Log(["frame #" + this._count + " - setSize -", width, height]);
-            }
-        }
         this._initializeMainAttachments();
         if (this.snapshotRendering) {
             // reset snapshot rendering so that the next frame will record a new list of bundles
@@ -1023,21 +1012,6 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         else {
             this._getCurrentRenderPass().setViewport(x, y, w, h, 0, 1);
         }
-        if (this.dbgVerboseLogsForFirstFrames) {
-            if (this._count === undefined) {
-                this._count = 0;
-            }
-            if (!this._count || this._count < this.dbgVerboseLogsNumFrames) {
-                Logger.Log([
-                    "frame #" + this._count + " - viewport applied - (",
-                    this._viewportCached.x,
-                    this._viewportCached.y,
-                    this._viewportCached.z,
-                    this._viewportCached.w,
-                    ") current pass is main pass=" + this._currentPassIsMainPass(),
-                ]);
-            }
-        }
     }
     /**
      * @internal
@@ -1067,21 +1041,6 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         else {
             this._getCurrentRenderPass().setScissorRect(this._scissorCached.x, y, this._scissorCached.z, this._scissorCached.w);
         }
-        if (this.dbgVerboseLogsForFirstFrames) {
-            if (this._count === undefined) {
-                this._count = 0;
-            }
-            if (!this._count || this._count < this.dbgVerboseLogsNumFrames) {
-                Logger.Log([
-                    "frame #" + this._count + " - scissor applied - (",
-                    this._scissorCached.x,
-                    this._scissorCached.y,
-                    this._scissorCached.z,
-                    this._scissorCached.w,
-                    ") current pass is main pass=" + this._currentPassIsMainPass(),
-                ]);
-            }
-        }
     }
     _scissorIsActive() {
         return this._scissorCached.x !== 0 || this._scissorCached.y !== 0 || this._scissorCached.z !== 0 || this._scissorCached.w !== 0;
@@ -1156,14 +1115,6 @@ export class WebGPUEngine extends ThinWebGPUEngine {
             this._clearStencilValue = stencilClearValue;
         }
         const hasScissor = this._scissorIsActive();
-        if (this.dbgVerboseLogsForFirstFrames) {
-            if (this._count === undefined) {
-                this._count = 0;
-            }
-            if (!this._count || this._count < this.dbgVerboseLogsNumFrames) {
-                Logger.Log(["frame #" + this._count + " - clear - backBuffer=", backBuffer, " depth=", depth, " stencil=", stencil, " scissor is active=", hasScissor]);
-            }
-        }
         // We need to recreate the render pass so that the new parameters for clear color / depth / stencil are taken into account
         if (this._currentRenderTarget) {
             if (hasScissor) {
@@ -2138,16 +2089,6 @@ export class WebGPUEngine extends ThinWebGPUEngine {
             }
             this._setInternalTexture(name, internalTexture, baseName);
         }
-        else {
-            if (this.dbgVerboseLogsForFirstFrames) {
-                if (this._count === undefined) {
-                    this._count = 0;
-                }
-                if (!this._count || this._count < this.dbgVerboseLogsNumFrames) {
-                    Logger.Log(["frame #" + this._count + " - _setTexture called with a null _currentEffect! texture=", texture]);
-                }
-            }
-        }
         return true;
     }
     /**
@@ -2307,24 +2248,10 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         this._snapshotRendering.endFrame();
         this._timestampQuery.endFrame(this._renderEncoder);
         this._timestampIndex = 0;
+        this._internalFrameCounter = 0;
         this.flushFramebuffer();
         this._textureHelper.destroyDeferredTextures();
         this._bufferManager.destroyDeferredBuffers();
-        if (this._features._collectUbosUpdatedInFrame) {
-            if (this.dbgVerboseLogsForFirstFrames) {
-                if (this._count === undefined) {
-                    this._count = 0;
-                }
-                if (!this._count || this._count < this.dbgVerboseLogsNumFrames) {
-                    const list = [];
-                    for (const name in UniformBuffer._UpdatedUbosInFrame) {
-                        list.push(name + ":" + UniformBuffer._UpdatedUbosInFrame[name]);
-                    }
-                    Logger.Log(["frame #" + this._count + " - updated ubos -", list.join(", ")]);
-                }
-            }
-            UniformBuffer._UpdatedUbosInFrame = {};
-        }
         this.countersLastFrame.numEnableEffects = this._counters.numEnableEffects;
         this.countersLastFrame.numEnableDrawWrapper = this._counters.numEnableDrawWrapper;
         this.countersLastFrame.numBundleCreationNonCompatMode = this._counters.numBundleCreationNonCompatMode;
@@ -2335,20 +2262,6 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         this._counters.numBundleReuseNonCompatMode = 0;
         this._cacheRenderPipeline.endFrame();
         this._cacheBindGroups.endFrame();
-        if (this.dbgVerboseLogsForFirstFrames) {
-            if (this._count === undefined) {
-                this._count = 0;
-            }
-            if (this._count < this.dbgVerboseLogsNumFrames) {
-                Logger.Log(["%c frame #" + this._count + " - end", "background: #ffff00"]);
-            }
-            if (this._count < this.dbgVerboseLogsNumFrames) {
-                this._count++;
-                if (this._count !== this.dbgVerboseLogsNumFrames) {
-                    Logger.Log(["%c frame #" + this._count + " - begin", "background: #ffff00"]);
-                }
-            }
-        }
         super.endFrame();
     }
     /**Gets driver info if available */
@@ -2361,11 +2274,22 @@ export class WebGPUEngine extends ThinWebGPUEngine {
     flushFramebuffer() {
         // we need to end the current render pass (main or rtt) if any as we are not allowed to submit the command buffers when being in a pass
         this._endCurrentRenderPass();
+        if (this._debugStackRenderEncoder.length !== 0) {
+            // We have pushed debug groups without popping them, we need to pop them before ending the render encoder to avoid WebGPU validation errors
+            // We will re-push them after creating the new render encoder
+            for (let i = 0; i < this._debugStackRenderEncoder.length; ++i) {
+                this._renderEncoder.popDebugGroup();
+            }
+        }
         this._commandBuffers[0] = this._uploadEncoder.finish();
         this._commandBuffers[1] = this._renderEncoder.finish();
         this._device.queue.submit(this._commandBuffers);
+        const frameCounter = this._internalFrameCounter++;
+        this._uploadEncoderDescriptor.label = `[${this.frameId}|${frameCounter}] - UploadEncoder`;
+        this._renderEncoderDescriptor.label = `[${this.frameId}|${frameCounter}] - RenderEncoder`;
         this._uploadEncoder = this._device.createCommandEncoder(this._uploadEncoderDescriptor);
         this._renderEncoder = this._device.createCommandEncoder(this._renderEncoderDescriptor);
+        this._debugPushPendingGroups(false);
         this._timestampQuery.startFrame(this._uploadEncoder);
         this._textureHelper.setCommandEncoder(this._uploadEncoder);
         this._bundleList.reset();
@@ -2488,8 +2412,9 @@ export class WebGPUEngine extends ThinWebGPUEngine {
                 colorAttachments.push(null);
             }
         }
+        const frameCounter = this._internalFrameCounter++;
         this._rttRenderPassWrapper.renderPassDescriptor = {
-            label: (renderTargetWrapper.label ?? "RTT") + " - RenderPass",
+            label: `[${this.frameId}|${frameCounter}] - ` + (renderTargetWrapper.label ?? "RTT") + " - RenderPass",
             colorAttachments,
             depthStencilAttachment: depthStencilTexture && gpuDepthStencilTexture
                 ? {
@@ -2512,30 +2437,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         };
         this._timestampQuery.startPass(this._rttRenderPassWrapper.renderPassDescriptor, this._timestampIndex);
         this._currentRenderPass = this._renderEncoder.beginRenderPass(this._rttRenderPassWrapper.renderPassDescriptor);
-        if (this.dbgVerboseLogsForFirstFrames) {
-            if (this._count === undefined) {
-                this._count = 0;
-            }
-            if (!this._count || this._count < this.dbgVerboseLogsNumFrames) {
-                const internalTexture = rtWrapper.texture;
-                Logger.Log([
-                    "frame #" +
-                        this._count +
-                        " - render target begin pass - rtt name=" +
-                        renderTargetWrapper.label +
-                        ", internalTexture.uniqueId=" +
-                        internalTexture.uniqueId +
-                        ", width=" +
-                        internalTexture.width +
-                        ", height=" +
-                        internalTexture.height +
-                        ", setClearStates=" +
-                        setClearStates,
-                    "renderPassDescriptor=",
-                    this._rttRenderPassWrapper.renderPassDescriptor,
-                ]);
-            }
-        }
+        this._debugPushPendingGroups(true);
         this._resetRenderPassStates();
         if (!gpuDepthStencilWrapper || !WebGPUTextureHelper.HasStencilAspect(gpuDepthStencilWrapper.format)) {
             this._stencilStateComposer.enabled = false;
@@ -2549,6 +2451,8 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         const mustClearColor = setClearStates && clearColor;
         const mustClearDepth = setClearStates && clearDepth;
         const mustClearStencil = setClearStates && clearStencil;
+        const frameCounter = this._internalFrameCounter++;
+        this._mainRenderPassWrapper.renderPassDescriptor.label = `[${this.frameId}|${frameCounter}] - MainRenderPass`;
         this._mainRenderPassWrapper.renderPassDescriptor.colorAttachments[0].clearValue = mustClearColor ? clearColor : undefined;
         this._mainRenderPassWrapper.renderPassDescriptor.colorAttachments[0].loadOp = mustClearColor ? "clear" /* WebGPUConstants.LoadOp.Clear */ : "load" /* WebGPUConstants.LoadOp.Load */;
         this._mainRenderPassWrapper.renderPassDescriptor.depthStencilAttachment.depthClearValue = mustClearDepth
@@ -2575,21 +2479,9 @@ export class WebGPUEngine extends ThinWebGPUEngine {
             ViewDescriptorSwapChain.format = swapChainTexture.format;
             this._mainRenderPassWrapper.renderPassDescriptor.colorAttachments[0].view = swapChainTexture.createView(ViewDescriptorSwapChain);
         }
-        if (this.dbgVerboseLogsForFirstFrames) {
-            if (this._count === undefined) {
-                this._count = 0;
-            }
-            if (!this._count || this._count < this.dbgVerboseLogsNumFrames) {
-                Logger.Log([
-                    "frame #" + this._count + " - main begin pass - texture width=" + this._mainTextureExtends.width,
-                    " height=" + this._mainTextureExtends.height + ", setClearStates=" + setClearStates,
-                    "renderPassDescriptor=",
-                    this._mainRenderPassWrapper.renderPassDescriptor,
-                ]);
-            }
-        }
         this._timestampQuery.startPass(this._mainRenderPassWrapper.renderPassDescriptor, this._timestampIndex);
         this._currentRenderPass = this._renderEncoder.beginRenderPass(this._mainRenderPassWrapper.renderPassDescriptor);
+        this._debugPushPendingGroups(true);
         this._setDepthTextureFormat(this._mainRenderPassWrapper);
         this._setColorFormat(this._mainRenderPassWrapper);
         this._resetRenderPassStates();
@@ -2641,31 +2533,6 @@ export class WebGPUEngine extends ThinWebGPUEngine {
             arrayLayerCount: 1,
             aspect: "all" /* WebGPUConstants.TextureAspect.All */,
         };
-        if (this.dbgVerboseLogsForFirstFrames) {
-            if (this._count === undefined) {
-                this._count = 0;
-            }
-            if (!this._count || this._count < this.dbgVerboseLogsNumFrames) {
-                Logger.Log([
-                    "frame #" +
-                        this._count +
-                        " - bindFramebuffer - rtt name=" +
-                        texture.label +
-                        ", internalTexture.uniqueId=" +
-                        texture.texture?.uniqueId +
-                        ", face=" +
-                        faceIndex +
-                        ", lodLevel=" +
-                        lodLevel +
-                        ", layer=" +
-                        layer,
-                    "colorAttachmentViewDescriptor=",
-                    this._rttRenderPassWrapper.colorAttachmentViewDescriptor,
-                    "depthAttachmentViewDescriptor=",
-                    this._rttRenderPassWrapper.depthAttachmentViewDescriptor,
-                ]);
-            }
-        }
         // We don't create the render pass just now, we do a lazy creation of the render pass, hoping the render pass will be created by a call to clear()...
         // However, if snapshot rendering is enabled, we need to create the render pass immediately, to be sure currentRenderPass is not null when _endCurrentRenderPass() is called.
         // (as in snapshot rendering mode, we may not have a call to clear() before _endCurrentRenderPass(), so lazy creation would not work)
@@ -2708,14 +2575,6 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         this._endCurrentRenderPass();
         this._resolveAndGenerateMipMapsFramebuffer(texture, disableGenerateMipMaps);
         this._currentRenderTarget = null;
-        if (this.dbgVerboseLogsForFirstFrames) {
-            if (this._count === undefined) {
-                this._count = 0;
-            }
-            if (!this._count || this._count < this.dbgVerboseLogsNumFrames) {
-                Logger.Log("frame #" + this._count + " - unBindFramebuffer - rtt name=" + texture.label + ", internalTexture.uniqueId=", texture.texture?.uniqueId);
-            }
-        }
         this._mrtAttachments = [];
         this._cacheRenderPipeline.setMRT([]);
         this._cacheRenderPipeline.setMRTAttachments(this._mrtAttachments);