@onerjs/core 8.31.9 → 8.32.1

package/Engines/webgpuEngine.js

@@ -2387,6 +2387,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         // 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();
@@ -2478,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,