@babylonjs/core 8.38.0 → 8.39.1

package/Engines/webgpuEngine.d.ts

@@ -863,7 +863,8 @@ export declare class WebGPUEngine extends ThinWebGPUEngine {
     flushFramebuffer(): void;
     /** @internal */
     _currentFrameBufferIsDefaultFrameBuffer(): boolean;
-    private _startRenderTargetRenderPass;
+    /** @internal */
+    _startRenderTargetRenderPass(renderTargetWrapper: RenderTargetWrapper, setClearStates: boolean, clearColor: Nullable<IColor4Like>, clearDepth: boolean, clearStencil: boolean): void;
     private _startMainRenderPass;
     /**
      * Binds the frame buffer to the specified texture.
@@ -883,17 +884,19 @@ export declare class WebGPUEngine extends ThinWebGPUEngine {
      * @param onBeforeUnbind defines a function which will be called before the effective unbind
      */
     unBindFramebuffer(texture: RenderTargetWrapper, disableGenerateMipMaps?: boolean, onBeforeUnbind?: () => void): void;
+    private _resolveAndGenerateMipMapsFramebuffer;
     /**
      * Generates mipmaps for the texture of the (single) render target
      * @param texture The render target containing the texture to generate the mipmaps for
      */
     generateMipMapsFramebuffer(texture: RenderTargetWrapper): void;
     /**
-     * Resolves the MSAA texture of the (single) render target into its non-MSAA version.
+     * Resolves the MSAA texture of the render target into its non-MSAA version.
      * Note that if "texture" is not a MSAA render target, no resolve is performed.
-     * @param _texture The render target texture containing the MSAA texture to resolve
+     * @param texture The render target texture containing the MSAA texture to resolve
+     * @param resolveColors If true, resolve the color textures (default: true) - still subject to texture.resolveMSAAColors
      */
-    resolveFramebuffer(_texture: RenderTargetWrapper): void;
+    resolveFramebuffer(texture: RenderTargetWrapper, resolveColors?: boolean): void;
     /**
      * Unbind the current render target and bind the default framebuffer
      */

package/Engines/webgpuEngine.js

@@ -2374,6 +2374,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
     //------------------------------------------------------------------------------
     //                              Render Pass
     //------------------------------------------------------------------------------
+    /** @internal */
     _startRenderTargetRenderPass(renderTargetWrapper, setClearStates, clearColor, clearDepth, clearStencil) {
         this._endCurrentRenderPass();
         const rtWrapper = renderTargetWrapper;
@@ -2381,9 +2382,12 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         const gpuDepthStencilWrapper = depthStencilTexture?._hardwareTexture;
         const gpuDepthStencilTexture = gpuDepthStencilWrapper?.underlyingResource;
         const gpuDepthStencilMSAATexture = gpuDepthStencilWrapper?.getMSAATexture(0);
-        const depthTextureView = gpuDepthStencilTexture?.createView(this._rttRenderPassWrapper.depthAttachmentViewDescriptor);
         const depthMSAATextureView = gpuDepthStencilMSAATexture?.createView(this._rttRenderPassWrapper.depthAttachmentViewDescriptor);
-        const depthTextureHasStencil = gpuDepthStencilWrapper ? WebGPUTextureHelper.HasStencilAspect(gpuDepthStencilWrapper.format) : false;
+        const depthTextureView = depthMSAATextureView ? undefined : gpuDepthStencilTexture?.createView(this._rttRenderPassWrapper.depthAttachmentViewDescriptor);
+        // We use the MSAA texture format (if available) to determine if it has a stencil aspect or not because, for MSAA depth textures,
+        // the format of the "resolve" texture (gpuDepthStencilWrapper.format) is a single red channel format, not a depth-stencil format.
+        const depthTextureHasStencil = gpuDepthStencilWrapper ? WebGPUTextureHelper.HasStencilAspect(gpuDepthStencilMSAATexture?.format ?? gpuDepthStencilWrapper.format) : false;
+        const depthTextureHasDepth = gpuDepthStencilWrapper ? WebGPUTextureHelper.HasDepthAspect(gpuDepthStencilMSAATexture?.format ?? gpuDepthStencilWrapper.format) : false;
         const colorAttachments = [];
         if (this.useReverseDepthBuffer) {
             this.setDepthFunctionToGreaterOrEqual();
@@ -2428,7 +2432,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
                     const colorMSAATextureView = gpuMSAATexture?.createView(msaaViewDescriptor);
                     colorAttachments.push({
                         view: colorMSAATextureView ? colorMSAATextureView : colorTextureView,
-                        resolveTarget: gpuMSAATexture ? colorTextureView : undefined,
+                        resolveTarget: gpuMSAATexture && !rtWrapper.disableAutomaticMSAAResolve ? colorTextureView : undefined,
                         depthSlice: mrtTexture.is3D ? (rtWrapper.layerIndices?.[i] ?? 0) : undefined,
                         clearValue: index !== 0 && mustClearColor ? (isRtInteger ? clearColorForIntegerRt : clearColor) : undefined,
                         loadOp: index !== 0 && mustClearColor ? "clear" /* WebGPUConstants.LoadOp.Clear */ : "load" /* WebGPUConstants.LoadOp.Load */,
@@ -2456,7 +2460,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
                 const isRtInteger = internalTexture.type === 7 || internalTexture.type === 5;
                 colorAttachments.push({
                     view: colorMSAATextureView ? colorMSAATextureView : colorTextureView,
-                    resolveTarget: gpuMSAATexture ? colorTextureView : undefined,
+                    resolveTarget: gpuMSAATexture && !rtWrapper.disableAutomaticMSAAResolve ? colorTextureView : undefined,
                     depthSlice,
                     clearValue: mustClearColor ? (isRtInteger ? clearColorForIntegerRt : clearColor) : undefined,
                     loadOp: mustClearColor ? "clear" /* WebGPUConstants.LoadOp.Clear */ : "load" /* WebGPUConstants.LoadOp.Load */,
@@ -2475,18 +2479,16 @@ export class WebGPUEngine extends ThinWebGPUEngine {
                 ? {
                     view: depthMSAATextureView ? depthMSAATextureView : depthTextureView,
                     depthClearValue: mustClearDepth ? (this.useReverseDepthBuffer ? this._clearReverseDepthValue : this._clearDepthValue) : undefined,
-                    depthLoadOp: rtWrapper.depthReadOnly ? undefined : mustClearDepth ? "clear" /* WebGPUConstants.LoadOp.Clear */ : "load" /* WebGPUConstants.LoadOp.Load */,
-                    depthStoreOp: rtWrapper.depthReadOnly ? undefined : "store" /* WebGPUConstants.StoreOp.Store */,
+                    depthLoadOp: rtWrapper.depthReadOnly || !depthTextureHasDepth ? undefined : mustClearDepth ? "clear" /* WebGPUConstants.LoadOp.Clear */ : "load" /* WebGPUConstants.LoadOp.Load */,
+                    depthStoreOp: rtWrapper.depthReadOnly || !depthTextureHasDepth ? undefined : "store" /* WebGPUConstants.StoreOp.Store */,
                     depthReadOnly: rtWrapper.depthReadOnly,
                     stencilClearValue: rtWrapper._depthStencilTextureWithStencil && mustClearStencil ? this._clearStencilValue : undefined,
-                    stencilLoadOp: rtWrapper.stencilReadOnly
+                    stencilLoadOp: rtWrapper.stencilReadOnly || !depthTextureHasStencil
                         ? undefined
-                        : !depthTextureHasStencil
-                            ? undefined
-                            : rtWrapper._depthStencilTextureWithStencil && mustClearStencil
-                                ? "clear" /* WebGPUConstants.LoadOp.Clear */
-                                : "load" /* WebGPUConstants.LoadOp.Load */,
-                    stencilStoreOp: rtWrapper.stencilReadOnly ? undefined : !depthTextureHasStencil ? undefined : "store" /* WebGPUConstants.StoreOp.Store */,
+                        : rtWrapper._depthStencilTextureWithStencil && mustClearStencil
+                            ? "clear" /* WebGPUConstants.LoadOp.Clear */
+                            : "load" /* WebGPUConstants.LoadOp.Load */,
+                    stencilStoreOp: rtWrapper.stencilReadOnly || !depthTextureHasStencil ? undefined : "store" /* WebGPUConstants.StoreOp.Store */,
                     stencilReadOnly: rtWrapper.stencilReadOnly,
                 }
                 : undefined,
@@ -2607,6 +2609,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         this._setDepthTextureFormat(this._rttRenderPassWrapper);
         this._setColorFormat(this._rttRenderPassWrapper);
         this._rttRenderPassWrapper.colorAttachmentViewDescriptor = {
+            label: texture.label ? texture.label + " - Color Attachment View" : "RTT - Color Attachment View",
             format: this._colorFormat,
             dimension: texture.is3D ? "3d" /* WebGPUConstants.TextureViewDimension.E3d */ : "2d" /* WebGPUConstants.TextureViewDimension.E2d */,
             mipLevelCount: 1,
@@ -2616,6 +2619,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
             aspect: "all" /* WebGPUConstants.TextureAspect.All */,
         };
         this._rttRenderPassWrapper.depthAttachmentViewDescriptor = {
+            label: texture.label ? texture.label + " - Depth Attachment View" : "RTT - Depth Attachment View",
             format: this._depthTextureFormat,
             dimension: depthStencilTexture && depthStencilTexture.is3D ? "3d" /* WebGPUConstants.TextureViewDimension.E3d */ : "2d" /* WebGPUConstants.TextureViewDimension.E2d */,
             mipLevelCount: 1,
@@ -2689,14 +2693,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         }
         this._currentRenderTarget = saveCrt;
         this._endCurrentRenderPass();
-        if (!disableGenerateMipMaps) {
-            if (texture.isMulti) {
-                this.generateMipMapsMultiFramebuffer(texture);
-            }
-            else {
-                this.generateMipMapsFramebuffer(texture);
-            }
-        }
+        this._resolveAndGenerateMipMapsFramebuffer(texture, disableGenerateMipMaps);
         this._currentRenderTarget = null;
         if (this.dbgVerboseLogsForFirstFrames) {
             if (this._count === undefined) {
@@ -2710,6 +2707,21 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         this._cacheRenderPipeline.setMRT([]);
         this._cacheRenderPipeline.setMRTAttachments(this._mrtAttachments);
     }
+    _resolveAndGenerateMipMapsFramebuffer(texture, disableGenerateMipMaps = false) {
+        const webglRtWrapper = texture;
+        if (!webglRtWrapper.disableAutomaticMSAAResolve) {
+            // we pass false as the second parameter because the color resolve has already been done automatically when the render pass ended
+            this.resolveFramebuffer(texture, false);
+        }
+        if (!disableGenerateMipMaps) {
+            if (texture.isMulti) {
+                this.generateMipMapsMultiFramebuffer(texture);
+            }
+            else {
+                this.generateMipMapsFramebuffer(texture);
+            }
+        }
+    }
     /**
      * Generates mipmaps for the texture of the (single) render target
      * @param texture The render target containing the texture to generate the mipmaps for
@@ -2720,12 +2732,28 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         }
     }
     /**
-     * Resolves the MSAA texture of the (single) render target into its non-MSAA version.
+     * Resolves the MSAA texture of the render target into its non-MSAA version.
      * Note that if "texture" is not a MSAA render target, no resolve is performed.
-     * @param _texture The render target texture containing the MSAA texture to resolve
+     * @param texture The render target texture containing the MSAA texture to resolve
+     * @param resolveColors If true, resolve the color textures (default: true) - still subject to texture.resolveMSAAColors
      */
-    resolveFramebuffer(_texture) {
-        throw new Error("resolveFramebuffer is not yet implemented in WebGPU!");
+    resolveFramebuffer(texture, resolveColors = true) {
+        if (texture.samples <= 1) {
+            return;
+        }
+        if (texture.resolveMSAAColors && resolveColors) {
+            const disableAutomaticMSAAResolve = texture.disableAutomaticMSAAResolve;
+            texture.disableAutomaticMSAAResolve = false;
+            // Simply bind and unbind the framebuffer to trigger the resolve
+            this.bindFramebuffer(texture);
+            this._startRenderTargetRenderPass(this._currentRenderTarget, false, null, false, false);
+            this.unBindFramebuffer(texture);
+            texture.disableAutomaticMSAAResolve = disableAutomaticMSAAResolve;
+        }
+        if (texture.resolveMSAADepth && texture._depthStencilTexture) {
+            const gpuTextureWrapper = texture._depthStencilTexture._hardwareTexture;
+            this._textureHelper.resolveMSAADepthTexture(gpuTextureWrapper.getMSAATexture(0), gpuTextureWrapper.underlyingResource, this._renderEncoder);
+        }
     }
     /**
      * Unbind the current render target and bind the default framebuffer