@babylonjs/core 8.18.0 → 8.19.0

package/Engines/webgpuEngine.d.ts

@@ -138,7 +138,7 @@ export declare class WebGPUEngine extends ThinWebGPUEngine {
     /** @internal */
     readonly _clearReverseDepthValue = 0;
     /** @internal */
-    readonly _clearStencilValue = 0;
+    _clearStencilValue: number;
     private readonly _defaultSampleCount;
     /** @internal */
     _options: WebGPUEngineOptions;
@@ -216,8 +216,10 @@ export declare class WebGPUEngine extends ThinWebGPUEngine {
     _currentDrawContext: WebGPUDrawContext;
     /** @internal */
     _currentMaterialContext: WebGPUMaterialContext;
+    private _currentVertexBuffers;
     private _currentOverrideVertexBuffers;
     private _currentIndexBuffer;
+    private _dummyIndexBuffer;
     private _colorWriteLocal;
     private _forceEnableEffect;
     /**
@@ -464,8 +466,9 @@ export declare class WebGPUEngine extends ThinWebGPUEngine {
      * @param backBuffer defines if the back buffer must be cleared
      * @param depth defines if the depth buffer must be cleared
      * @param stencil defines if the stencil buffer must be cleared
+     * @param stencilClearValue defines the value to use to clear the stencil buffer (default is 0)
      */
-    clear(color: Nullable<IColor4Like>, backBuffer: boolean, depth: boolean, stencil?: boolean): void;
+    clear(color: Nullable<IColor4Like>, backBuffer: boolean, depth: boolean, stencil?: boolean, stencilClearValue?: number): void;
     private _clearFullQuad;
     /**
      * Creates a vertex buffer
@@ -525,12 +528,12 @@ export declare class WebGPUEngine extends ThinWebGPUEngine {
      * Bind a list of vertex buffers with the engine
      * @param vertexBuffers defines the list of vertex buffers to bind
      * @param indexBuffer defines the index buffer to bind
-     * @param effect defines the effect associated with the vertex buffers
+     * @param _effect defines the effect associated with the vertex buffers
      * @param overrideVertexBuffers defines optional list of avertex buffers that overrides the entries in vertexBuffers
      */
     bindBuffers(vertexBuffers: {
         [key: string]: Nullable<VertexBuffer>;
-    }, indexBuffer: Nullable<DataBuffer>, effect: Effect, overrideVertexBuffers?: {
+    }, indexBuffer: Nullable<DataBuffer>, _effect: Effect, overrideVertexBuffers?: {
         [kind: string]: Nullable<VertexBuffer>;
     }): void;
     /**

package/Engines/webgpuEngine.js

@@ -319,6 +319,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         };
         /** @internal */
         this._pendingDebugCommands = [];
+        this._currentVertexBuffers = {};
         this._currentOverrideVertexBuffers = null;
         this._currentIndexBuffer = null;
         this._colorWriteLocal = true;
@@ -515,6 +516,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
                 size: 1,
                 label: "EmptyVertexBuffer",
             });
+            this._dummyIndexBuffer = this._bufferManager.createBuffer(new Uint16Array([0, 0, 0, 0]), WebGPUConstants.BufferUsage.Storage | WebGPUConstants.BufferUsage.CopyDst, "DummyIndices");
             this._cacheRenderPipeline = new WebGPUCacheRenderPipelineTree(this._device, this._emptyVertexBuffer);
             this._depthCullingState = new WebGPUDepthCullingState(this._cacheRenderPipeline);
             this._stencilStateComposer = new WebGPUStencilStateComposer(this._cacheRenderPipeline);
@@ -1135,12 +1137,16 @@ export class WebGPUEngine extends ThinWebGPUEngine {
      * @param backBuffer defines if the back buffer must be cleared
      * @param depth defines if the depth buffer must be cleared
      * @param stencil defines if the stencil buffer must be cleared
+     * @param stencilClearValue defines the value to use to clear the stencil buffer (default is 0)
      */
-    clear(color, backBuffer, depth, stencil = false) {
+    clear(color, backBuffer, depth, stencil = false, stencilClearValue = 0) {
         // Some PGs are using color3...
         if (color && color.a === undefined) {
             color.a = 1;
         }
+        if (stencil) {
+            this._clearStencilValue = stencilClearValue;
+        }
         const hasScissor = this._scissorIsActive();
         if (this.dbgVerboseLogsForFirstFrames) {
             if (this._count === undefined) {
@@ -1218,7 +1224,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         else {
             view = data;
         }
-        const dataBuffer = this._bufferManager.createBuffer(view, WebGPUConstants.BufferUsage.Vertex | WebGPUConstants.BufferUsage.CopyDst, label);
+        const dataBuffer = this._bufferManager.createBuffer(view, WebGPUConstants.BufferUsage.Vertex | WebGPUConstants.BufferUsage.CopyDst | WebGPUConstants.BufferUsage.Storage, label);
         return dataBuffer;
     }
     /**
@@ -1259,7 +1265,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
                 is32Bits = false;
             }
         }
-        const dataBuffer = this._bufferManager.createBuffer(view, WebGPUConstants.BufferUsage.Index | WebGPUConstants.BufferUsage.CopyDst, label);
+        const dataBuffer = this._bufferManager.createBuffer(view, WebGPUConstants.BufferUsage.Index | WebGPUConstants.BufferUsage.CopyDst | WebGPUConstants.BufferUsage.Storage, label);
         dataBuffer.is32Bits = is32Bits;
         return dataBuffer;
     }
@@ -1380,13 +1386,14 @@ export class WebGPUEngine extends ThinWebGPUEngine {
      * Bind a list of vertex buffers with the engine
      * @param vertexBuffers defines the list of vertex buffers to bind
      * @param indexBuffer defines the index buffer to bind
-     * @param effect defines the effect associated with the vertex buffers
+     * @param _effect defines the effect associated with the vertex buffers
      * @param overrideVertexBuffers defines optional list of avertex buffers that overrides the entries in vertexBuffers
      */
-    bindBuffers(vertexBuffers, indexBuffer, effect, overrideVertexBuffers) {
+    bindBuffers(vertexBuffers, indexBuffer, _effect, overrideVertexBuffers) {
+        this._currentVertexBuffers = vertexBuffers;
         this._currentIndexBuffer = indexBuffer;
         this._currentOverrideVertexBuffers = overrideVertexBuffers ?? null;
-        this._cacheRenderPipeline.setBuffers(vertexBuffers, indexBuffer, this._currentOverrideVertexBuffers);
+        this._cacheRenderPipeline.setBuffers(this._currentVertexBuffers, this._currentIndexBuffer, this._currentOverrideVertexBuffers);
     }
     /**
      * @internal
@@ -1613,7 +1620,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
      * @returns the new context
      */
     createDrawContext() {
-        return new WebGPUDrawContext(this._bufferManager);
+        return new WebGPUDrawContext(this._bufferManager, this._dummyIndexBuffer);
     }
     /**
      * @internal
@@ -2461,15 +2468,19 @@ export class WebGPUEngine extends ThinWebGPUEngine {
                 ? {
                     view: depthMSAATextureView ? depthMSAATextureView : depthTextureView,
                     depthClearValue: mustClearDepth ? (this.useReverseDepthBuffer ? this._clearReverseDepthValue : this._clearDepthValue) : undefined,
-                    depthLoadOp: mustClearDepth ? "clear" /* WebGPUConstants.LoadOp.Clear */ : "load" /* WebGPUConstants.LoadOp.Load */,
-                    depthStoreOp: "store" /* WebGPUConstants.StoreOp.Store */,
+                    depthLoadOp: rtWrapper.depthReadOnly ? undefined : mustClearDepth ? "clear" /* WebGPUConstants.LoadOp.Clear */ : "load" /* WebGPUConstants.LoadOp.Load */,
+                    depthStoreOp: rtWrapper.depthReadOnly ? undefined : "store" /* WebGPUConstants.StoreOp.Store */,
+                    depthReadOnly: rtWrapper.depthReadOnly,
                     stencilClearValue: rtWrapper._depthStencilTextureWithStencil && mustClearStencil ? this._clearStencilValue : undefined,
-                    stencilLoadOp: !depthTextureHasStencil
+                    stencilLoadOp: rtWrapper.stencilReadOnly
                         ? undefined
-                        : rtWrapper._depthStencilTextureWithStencil && mustClearStencil
-                            ? "clear" /* WebGPUConstants.LoadOp.Clear */
-                            : "load" /* WebGPUConstants.LoadOp.Load */,
-                    stencilStoreOp: !depthTextureHasStencil ? undefined : "store" /* WebGPUConstants.StoreOp.Store */,
+                        : !depthTextureHasStencil
+                            ? undefined
+                            : rtWrapper._depthStencilTextureWithStencil && mustClearStencil
+                                ? "clear" /* WebGPUConstants.LoadOp.Clear */
+                                : "load" /* WebGPUConstants.LoadOp.Load */,
+                    stencilStoreOp: rtWrapper.stencilReadOnly ? undefined : !depthTextureHasStencil ? undefined : "store" /* WebGPUConstants.StoreOp.Store */,
+                    stencilReadOnly: rtWrapper.stencilReadOnly,
                 }
                 : undefined,
             occlusionQuerySet: this._occlusionQuery?.hasQueries ? this._occlusionQuery.querySet : undefined,
@@ -2826,6 +2837,8 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         this.applyStates();
         const webgpuPipelineContext = this._currentEffect._pipelineContext;
         this.bindUniformBufferBase(this._currentRenderTarget ? this._ubInvertY : this._ubDontInvertY, 0, WebGPUShaderProcessor.InternalsUBOName);
+        this._currentDrawContext.setVertexPulling(this._currentMaterialContext.useVertexPulling, webgpuPipelineContext, this._currentVertexBuffers, this._cacheRenderPipeline.indexBuffer, // don't use this._currentIndexBuffer, it will have been set to null by _drawArraysType!
+        this._currentOverrideVertexBuffers);
         if (webgpuPipelineContext.uniformBuffer) {
             webgpuPipelineContext.uniformBuffer.update();
             this.bindUniformBufferBase(webgpuPipelineContext.uniformBuffer.getBuffer(), 0, WebGPUShaderProcessor.LeftOvertUBOName);
@@ -2901,7 +2914,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
         }
         // draw
         const nonCompatMode = !this.compatibilityMode && !this._snapshotRendering.record;
-        if (nonCompatMode && this._currentDrawContext.indirectDrawBuffer) {
+        if (this._currentDrawContext.indirectDrawBuffer) {
             this._currentDrawContext.setIndirectData(count, instancesCount || 1, start);
             if (drawType === 0) {
                 renderPass2.drawIndexedIndirect(this._currentDrawContext.indirectDrawBuffer, 0);