V3.8.1 gpu-driven

cocos/asset/assets/rendering-sub-mesh.ts

@@ -135,16 +135,19 @@ export class RenderingSubMesh {
      * @param indirectBuffer @en indirect buffer. @zh 间接缓冲区。
      */
     constructor (
-        vertexBuffers: Buffer[], attributes: Attribute[], primitiveMode: PrimitiveMode,
-        indexBuffer: Buffer | null = null, indirectBuffer: Buffer | null = null,
+        vertexBuffers: Buffer[],
+        attributes: Attribute[],
+        primitiveMode: PrimitiveMode,
+        indexBuffer: Buffer | null = null,
+        indirectBuffer: Buffer | null = null,
         isOwnerOfIndexBuffer = true,
     ) {
         this._attributes = attributes;
         this._vertexBuffers = vertexBuffers;
         this._indexBuffer = indexBuffer;
         this._indirectBuffer = indirectBuffer;
         this._primitiveMode = primitiveMode;
-        this._iaInfo = new InputAssemblerInfo(attributes, vertexBuffers, indexBuffer, indirectBuffer);
+        this._iaInfo = new InputAssemblerInfo(attributes, vertexBuffers, indexBuffer);
         this._isOwnerOfIndexBuffer = isOwnerOfIndexBuffer;
     }
 
@@ -197,7 +200,7 @@ export class RenderingSubMesh {
         const indices = mesh.readIndices(index) as Uint16Array;
         const max = new Vec3();
         const min = new Vec3();
-        const pAttri = this.attributes.find((element): boolean => element.name === AttributeName.ATTR_POSITION);
+        const pAttri = this.attributes.find((element): boolean => element.name === AttributeName.ATTR_POSITION as string);
         if (pAttri) {
             const conut = FormatInfos[pAttri.format].count;
             if (conut === 2) {
@@ -307,14 +310,14 @@ export class RenderingSubMesh {
         }
         let jointFormat: Format;
         let jointOffset: number;
-        const { device } = cclegacy.director.root;
+        const device = cclegacy.director.root.device as Device;
         for (let i = 0; i < prim.vertexBundelIndices.length; i++) {
             const bundle = struct.vertexBundles[prim.vertexBundelIndices[i]];
             jointOffset = 0;
             jointFormat = Format.UNKNOWN;
             for (let j = 0; j < bundle.attributes.length; j++) {
                 const attr = bundle.attributes[j];
-                if (attr.name === AttributeName.ATTR_JOINTS) {
+                if (attr.name === AttributeName.ATTR_JOINTS as string) {
                     jointFormat = attr.format;
                     break;
                 }
@@ -324,8 +327,15 @@ export class RenderingSubMesh {
                 const data = new Uint8Array(this.mesh.data.buffer, bundle.view.offset, bundle.view.length);
                 const dataView = new DataView(data.slice().buffer);
                 const idxMap = struct.jointMaps[prim.jointMapIndex];
-                mapBuffer(dataView, (cur): number => idxMap.indexOf(cur), jointFormat, jointOffset,
-                    bundle.view.length, bundle.view.stride, dataView);
+                mapBuffer(
+                    dataView,
+                    (cur): number => idxMap.indexOf(cur),
+                    jointFormat,
+                    jointOffset,
+                    bundle.view.length,
+                    bundle.view.stride,
+                    dataView,
+                );
                 const buffer = device.createBuffer(new BufferInfo(
                     BufferUsageBit.VERTEX | BufferUsageBit.TRANSFER_DST,
                     MemoryUsageBit.DEVICE,

cocos/gfx/base/define.ts

@@ -407,7 +407,8 @@ export enum TextureFlagBit {
     GENERAL_LAYOUT = 0x2, // For inout framebuffer attachments
     EXTERNAL_OES = 0x4, // External oes texture
     EXTERNAL_NORMAL = 0x8, // External normal texture
-    LAZILY_ALLOCATED = 0x10 // Try lazily allocated mode.
+    MUTABLE_STORAGE = 0x10, //  Texture is mutable or not, default is immutable(only for webgl2)
+    LAZILY_ALLOCATED = 0x20, // Try lazily allocated mode.
 }
 
 export enum FormatFeatureBit {
@@ -1502,14 +1503,12 @@ export class InputAssemblerInfo {
         public attributes: Attribute[] = [],
         public vertexBuffers: Buffer[] = [],
         public indexBuffer: Buffer | null = null,
-        public indirectBuffer: Buffer | null = null,
     ) {}
 
     public copy (info: Readonly<InputAssemblerInfo>): InputAssemblerInfo {
         deepCopy(this.attributes, info.attributes, Attribute);
         this.vertexBuffers = info.vertexBuffers.slice();
         this.indexBuffer = info.indexBuffer;
-        this.indirectBuffer = info.indirectBuffer;
         return this;
     }
 }

cocos/gfx/base/input-assembler.ts

@@ -55,14 +55,6 @@ export abstract class InputAssembler extends GFXObject {
         return this._indexBuffer;
     }
 
-    /**
-     * @en Get the indirect buffer, if present.
-     * @zh 间接绘制缓冲。
-     */
-    get indirectBuffer (): Buffer | null {
-        return this._indirectBuffer;
-    }
-
     /**
      * @en Get hash of current attributes.
      * @zh 获取顶点属性数组的哈希值。
@@ -169,7 +161,6 @@ export abstract class InputAssembler extends GFXObject {
 
     protected _vertexBuffers: Buffer[] = [];
     protected _indexBuffer: Buffer | null = null;
-    protected _indirectBuffer: Buffer | null = null;
 
     protected _drawInfo = new DrawInfo();
 

cocos/gfx/webgl/webgl-buffer.ts

@@ -33,6 +33,7 @@ import {
 } from './webgl-commands';
 import { IWebGLGPUBuffer, IWebGLGPUBufferView, WebGLIndirectDrawInfos } from './webgl-gpu-objects';
 import { WebGLDeviceManager } from './webgl-define';
+import { warn } from '../../core/platform';
 
 export class WebGLBuffer extends Buffer {
     get gpuBuffer (): IWebGLGPUBuffer {
@@ -83,7 +84,6 @@ export class WebGLBuffer extends Buffer {
                 stride: this._stride,
                 buffer: null,
                 vf32: null,
-                indirects: new WebGLIndirectDrawInfos(),
                 glTarget: 0,
                 glBuffer: null,
             };
@@ -112,7 +112,7 @@ export class WebGLBuffer extends Buffer {
 
     public resize (size: number): void {
         if (this._isBufferView) {
-            console.warn('cannot resize buffer views!');
+            warn('cannot resize buffer views!');
             return;
         }
 
@@ -142,7 +142,7 @@ export class WebGLBuffer extends Buffer {
 
     public update (buffer: Readonly<BufferSource>, size?: number): void {
         if (this._isBufferView) {
-            console.warn('cannot update through buffer views!');
+            warn('cannot update through buffer views!');
             return;
         }
 

cocos/gfx/webgl/webgl-commands.ts

@@ -782,12 +782,6 @@ export function WebGLCmdFuncUpdateBuffer (
         } else {
             gpuBuffer.vf32!.set(new Float32Array(buffer as ArrayBuffer), offset / Float32Array.BYTES_PER_ELEMENT);
         }
-    } else if (gpuBuffer.usage & BufferUsageBit.INDIRECT) {
-        gpuBuffer.indirects.clearDraws();
-        const drawInfos = (buffer as IndirectBuffer).drawInfos;
-        for (let i = 0; i < drawInfos.length; ++i) {
-            gpuBuffer.indirects.setDrawInfo(offset + i, drawInfos[i]);
-        }
     } else {
         const buff = buffer as ArrayBuffer;
         const { gl } = device;
@@ -2590,83 +2584,7 @@ export function WebGLCmdFuncDraw (device: WebGLDevice, drawInfo: Readonly<DrawIn
 
     if (gpuInputAssembler) {
         const indexBuffer = gpuInputAssembler.gpuIndexBuffer;
-        if (gpuInputAssembler.gpuIndirectBuffer) {
-            const indirects = gpuInputAssembler.gpuIndirectBuffer.indirects;
-            if (indirects.drawByIndex) {
-                for (let j = 0; j < indirects.drawCount; j++) {
-                    indirects.byteOffsets[j] = indirects.offsets[j] * indexBuffer!.stride;
-                }
-                if (md) {
-                    if (indirects.instancedDraw) {
-                        md.multiDrawElementsInstancedWEBGL(
-                            glPrimitive,
-                            indirects.counts,
-                            0,
-                            gpuInputAssembler.glIndexType,
-                            indirects.byteOffsets,
-                            0,
-                            indirects.instances,
-                            0,
-                            indirects.drawCount,
-                        );
-                    } else {
-                        md.multiDrawElementsWEBGL(
-                            glPrimitive,
-                            indirects.counts,
-                            0,
-                            gpuInputAssembler.glIndexType,
-                            indirects.byteOffsets,
-                            0,
-                            indirects.drawCount,
-                        );
-                    }
-                } else {
-                    for (let j = 0; j < indirects.drawCount; j++) {
-                        if (indirects.instances[j] && ia) {
-                            ia.drawElementsInstancedANGLE(
-                                glPrimitive,
-                                indirects.counts[j],
-                                gpuInputAssembler.glIndexType,
-                                indirects.byteOffsets[j],
-                                indirects.instances[j],
-                            );
-                        } else {
-                            gl.drawElements(glPrimitive, indirects.counts[j], gpuInputAssembler.glIndexType, indirects.byteOffsets[j]);
-                        }
-                    }
-                }
-            } else if (md) {
-                if (indirects.instancedDraw) {
-                    md.multiDrawArraysInstancedWEBGL(
-                        glPrimitive,
-                        indirects.offsets,
-                        0,
-                        indirects.counts,
-                        0,
-                        indirects.instances,
-                        0,
-                        indirects.drawCount,
-                    );
-                } else {
-                    md.multiDrawArraysWEBGL(
-                        glPrimitive,
-                        indirects.offsets,
-                        0,
-                        indirects.counts,
-                        0,
-                        indirects.drawCount,
-                    );
-                }
-            } else {
-                for (let j = 0; j < indirects.drawCount; j++) {
-                    if (indirects.instances[j] && ia) {
-                        ia.drawArraysInstancedANGLE(glPrimitive, indirects.offsets[j], indirects.counts[j], indirects.instances[j]);
-                    } else {
-                        gl.drawArrays(glPrimitive, indirects.offsets[j], indirects.counts[j]);
-                    }
-                }
-            }
-        } else if (drawInfo.instanceCount && ia) {
+        if (drawInfo.instanceCount && ia) {
             if (indexBuffer) {
                 if (drawInfo.indexCount > 0) {
                     const offset = drawInfo.firstIndex * indexBuffer.stride;

cocos/gfx/webgl/webgl-gpu-objects.ts

@@ -131,7 +131,6 @@ export interface IWebGLGPUBuffer {
 
     buffer: ArrayBufferView | null;
     vf32: Float32Array | null;
-    indirects: WebGLIndirectDrawInfos;
 }
 
 export interface IWebGLGPUTexture {
@@ -309,7 +308,6 @@ export interface IWebGLGPUInputAssembler {
     attributes: Attribute[];
     gpuVertexBuffers: IWebGLGPUBuffer[];
     gpuIndexBuffer: IWebGLGPUBuffer | null;
-    gpuIndirectBuffer: IWebGLGPUBuffer | null;
 
     glAttribs: IWebGLAttrib[];
     glIndexType: GLenum;
@@ -341,12 +339,16 @@ export class IWebGLBlitManager {
         this._gpuShader = {
             name: 'Blit Pass',
             blocks: [
-                new UniformBlock(0, 0, `BlitParams`,
+                new UniformBlock(
+                    0,
+                    0,
+                    `BlitParams`,
                     [
                         new Uniform(`tilingOffsetSrc`, Type.FLOAT4, 1),
                         new Uniform(`tilingOffsetDst`, Type.FLOAT4, 1),
                     ],
-                    1),
+                    1,
+                ),
             ],
             samplerTextures: [new UniformSamplerTexture(0, samplerOffset, 'textureSrc', Type.SAMPLER2D, 1)],
             subpassInputs: [],
@@ -430,7 +432,6 @@ export class IWebGLBlitManager {
             stride: 4 * Float32Array.BYTES_PER_ELEMENT,
             buffer: null,
             vf32: null,
-            indirects: new WebGLIndirectDrawInfos(),
             glTarget: 0,
             glBuffer: null,
         };
@@ -448,7 +449,6 @@ export class IWebGLBlitManager {
             attributes: [new Attribute(`a_position`, Format.RG32F), new Attribute(`a_texCoord`, Format.RG32F)],
             gpuVertexBuffers: [this._gpuVertexBuffer],
             gpuIndexBuffer: null,
-            gpuIndirectBuffer: null,
 
             glAttribs: [],
             glIndexType: 0,
@@ -480,7 +480,6 @@ export class IWebGLBlitManager {
             stride: 8 * Float32Array.BYTES_PER_ELEMENT,
             buffer: this._uniformBuffer,
             vf32: null,
-            indirects: new WebGLIndirectDrawInfos(),
             glTarget: 0,
             glBuffer: null,
         };
@@ -538,7 +537,7 @@ export class IWebGLBlitManager {
         descriptor.gpuSampler = filter === Filter.POINT ? this._gpuPointSampler : this._gpuLinearSampler;
 
         const formatInfo = FormatInfos[gpuTextureDst.format];
-        let attachment = gl.COLOR_ATTACHMENT0;
+        let attachment: number = gl.COLOR_ATTACHMENT0;
         if (formatInfo.hasStencil) {
             attachment = gl.DEPTH_STENCIL_ATTACHMENT;
         } else if (formatInfo.hasDepth) {
@@ -582,8 +581,13 @@ export class IWebGLBlitManager {
             this._uniformBuffer[6] = region.dstOffset.x / dstWidth;
             this._uniformBuffer[7] = region.dstOffset.y / dstHeight;
 
-            WebGLCmdFuncUpdateBuffer(device, this._gpuUniformBuffer, this._uniformBuffer, 0,
-                this._uniformBuffer.length * Float32Array.BYTES_PER_ELEMENT);
+            WebGLCmdFuncUpdateBuffer(
+                device,
+                this._gpuUniformBuffer,
+                this._uniformBuffer,
+                0,
+                this._uniformBuffer.length * Float32Array.BYTES_PER_ELEMENT,
+            );
             WebGLCmdFuncBindStates(device, this._gpuPipelineState, this._gpuInputAssembler, [this._gpuDescriptorSet], [], null!);
             WebGLCmdFuncDraw(device, this._drawInfo);
         }

cocos/gfx/webgl/webgl-input-assembler.ts

@@ -22,6 +22,7 @@
  THE SOFTWARE.
 */
 
+import { error } from '../../core/platform';
 import { InputAssemblerInfo } from '../base/define';
 import { InputAssembler } from '../base/input-assembler';
 import { WebGLBuffer } from './webgl-buffer';
@@ -38,7 +39,7 @@ export class WebGLInputAssembler extends InputAssembler {
 
     public initialize (info: Readonly<InputAssemblerInfo>): void {
         if (info.vertexBuffers.length === 0) {
-            console.error('InputAssemblerInfo.vertexBuffers is null.');
+            error('InputAssemblerInfo.vertexBuffers is null.');
             return;
         }
 
@@ -59,8 +60,6 @@ export class WebGLInputAssembler extends InputAssembler {
         this._drawInfo.instanceCount = 0;
         this._drawInfo.firstInstance = 0;
 
-        this._indirectBuffer = info.indirectBuffer || null;
-
         const gpuVertexBuffers: IWebGLGPUBuffer[] = new Array<IWebGLGPUBuffer>(info.vertexBuffers.length);
         for (let i = 0; i < info.vertexBuffers.length; ++i) {
             const vb = info.vertexBuffers[i] as WebGLBuffer;
@@ -79,22 +78,16 @@ export class WebGLInputAssembler extends InputAssembler {
                 case 2: glIndexType = 0x1403; break; // WebGLRenderingContext.UNSIGNED_SHORT
                 case 4: glIndexType = 0x1405; break; // WebGLRenderingContext.UNSIGNED_INT
                 default: {
-                    console.error('Error index buffer stride.');
+                    error('Error index buffer stride.');
                 }
                 }
             }
         }
 
-        let gpuIndirectBuffer: IWebGLGPUBuffer | null = null;
-        if (info.indirectBuffer) {
-            gpuIndirectBuffer = (info.indirectBuffer as WebGLBuffer).gpuBuffer;
-        }
-
         this._gpuInputAssembler = {
             attributes: info.attributes,
             gpuVertexBuffers,
             gpuIndexBuffer,
-            gpuIndirectBuffer,
 
             glAttribs: [],
             glIndexType,