Gpu driven 3rd stage commit

cocos/3d/framework/mesh-renderer.ts

@@ -312,6 +312,9 @@ export class MeshRenderer extends ModelRenderer {
     @serializable
     protected _mesh: Mesh | null = null;
 
+    @serializable
+    protected _gpuDrivenEnabled: boolean = true;
+
     @serializable
     protected _shadowCastingMode = ModelShadowCastingMode.OFF;
 
@@ -456,7 +459,7 @@ export class MeshRenderer extends ModelRenderer {
      * 注意，设置时，所有形变目标的权重都将归零。
      */
     @type(Mesh)
-    @displayOrder(1)
+    @displayOrder(0)
     get mesh (): Mesh | null {
         return this._mesh;
     }
@@ -479,6 +482,21 @@ export class MeshRenderer extends ModelRenderer {
         this._updateReceiveDirLight();
     }
 
+    /**
+     * @en Whether to enable GPU Driven.
+     * @zh 是否开启 GPU Driven 。
+     */
+    @editable
+    @displayOrder(1)
+    get gpuDrivenEnabled (): boolean {
+        return this._gpuDrivenEnabled;
+    }
+
+    set gpuDrivenEnabled (val) {
+        this._gpuDrivenEnabled = val;
+        this._updateGPUDrivenEnabled();
+    }
+
     /**
      * @en Gets the model in [[RenderScene]].
      * @zh 获取渲染场景 [[RenderScene]] 中对应的模型。
@@ -567,6 +585,7 @@ export class MeshRenderer extends ModelRenderer {
         this._updateUseReflectionProbe();
         this._updateReceiveDirLight();
         this._updateStandardSkin();
+        this._updateGPUDrivenEnabled();
     }
 
     // Redo, Undo, Prefab restore, etc.
@@ -584,6 +603,7 @@ export class MeshRenderer extends ModelRenderer {
         this._updateUseReflectionProbe();
         this._updateReceiveDirLight();
         this._updateStandardSkin();
+        this._updateGPUDrivenEnabled();
     }
 
     public onEnable (): void {
@@ -610,6 +630,7 @@ export class MeshRenderer extends ModelRenderer {
         this._onUpdateReflectionProbeDataMap();
         this._onUpdateLocalReflectionProbeData();
         this._updateStandardSkin();
+        this._updateGPUDrivenEnabled();
         this._attachToScene();
     }
 
@@ -916,6 +937,7 @@ export class MeshRenderer extends ModelRenderer {
             this._updateReceiveDirLight();
             this._onUpdateReflectionProbeDataMap();
             this._onUpdateLocalReflectionProbeData();
+            this._updateGPUDrivenEnabled();
         }
     }
 
@@ -974,9 +996,7 @@ export class MeshRenderer extends ModelRenderer {
             this._detachFromScene();
         }
 
-        if (this.supportGPUScene()) {
-            if (this.mesh) renderScene.addGPUMesh(this.mesh);
-
+        if (this.supportGPUDriven() && this.mesh!.isInGPUScene()) {
             renderScene.addGPUModel(this._model);
         } else {
             renderScene.addModel(this._model);
@@ -988,7 +1008,7 @@ export class MeshRenderer extends ModelRenderer {
      */
     public _detachFromScene (): void {
         if (this._model && this._model.scene) {
-            if (this.supportGPUScene()) {
+            if (this.supportGPUDriven() && this.mesh!.isInGPUScene()) {
                 this._model.scene.removeGPUModel(this._model);
             } else {
                 this._model.scene.removeModel(this._model);
@@ -999,12 +1019,16 @@ export class MeshRenderer extends ModelRenderer {
     /**
      * @engineInternal
      */
-    public supportGPUScene (): boolean {
+    public supportGPUDriven (): boolean {
         const sceneData = cclegacy.director.root.pipeline.pipelineSceneData;
         if (!sceneData || !sceneData.isGPUDrivenEnabled()) {
             return false;
         }
 
+        if (!this._gpuDrivenEnabled) {
+            return false;
+        }
+
         if (!this._mesh || !this.node) {
             return false;
         }
@@ -1168,6 +1192,11 @@ export class MeshRenderer extends ModelRenderer {
         }
     }
 
+    protected _updateGPUDrivenEnabled (): void {
+        if (!this._model) { return; }
+        this._model.gpuDrivenEnabled = this._gpuDrivenEnabled;
+    }
+
     protected onMobilityChanged (): void {
         this._updateUseLightProbe();
         this._updateReceiveDirLight();

cocos/asset/assets/simple-texture.ts

@@ -322,7 +322,9 @@ export class SimpleTexture extends TextureBase {
         if (this._width === 0 || this._height === 0) { return; }
         let flags = TextureFlagBit.NONE;
         if (this._mipFilter !== Filter.NONE && canGenerateMipmap(device, this._width, this._height)) {
-            this._mipmapLevel = getMipLevel(this._width, this._height);
+            if (!this.isCompressed) {
+                this._mipmapLevel = getMipLevel(this._width, this._height);
+            }
             if (!this.isUsingOfflineMipmaps() && !this.isCompressed) {
                 flags = TextureFlagBit.GEN_MIPMAP;
             }

cocos/game/director.ts

@@ -387,9 +387,11 @@ export class Director extends EventTarget {
             onBeforeLoadScene();
         }
 
-        if (scene.renderScene) {
-            scene.renderScene.activate();
+        if (scene) {
+            scene.renderScene?.activate();
+            scene.globals.activate(scene);
         }
+
         this.emit(Director.EVENT_BEFORE_SCENE_LAUNCH, scene);
 
         // Run an Entity Scene
@@ -535,8 +537,8 @@ export class Director extends EventTarget {
         for (let i = 0; i < renderers.length; i++) {
             const renderer = renderers[i];
             const mesh = renderer.mesh;
-            if (renderer.supportGPUScene()) {
-                meshes.push(mesh!);
+            if (mesh && mesh.supportGPUScene()) {
+                meshes.push(mesh);
             }
         }
 

cocos/render-scene/core/render-scene.ts

@@ -203,13 +203,14 @@ export class RenderScene {
     /**
      * @engineInternal
      */
-    public activate () {
+    public activate (): void {
+        // Do nothing
     }
 
     /**
      * @engineInternal
      */
-    public buildGPUScene (meshes: Mesh[]) {
+    public buildGPUScene (meshes: Mesh[]): void {
         // Only support in native.
     }
 
@@ -557,13 +558,6 @@ export class RenderScene {
         this._models.length = 0;
     }
 
-    /**
-     * Add a mesh to GPUScene.
-     * Only support in native.
-     * @internal
-     */
-    public addGPUMesh (m: Mesh): void {}
-
     /**
      * @en Add a GPU Driven model, all models attached to the render scene will be submitted for rendering.
      * @zh 增加一个 GPU Driven 模型，渲染场景上挂载的所有模型都会被提交渲染。

cocos/render-scene/scene/model.ts

@@ -384,6 +384,18 @@ export class Model {
         this._reflectionProbeBlendWeight = val;
     }
 
+    /**
+     * @en Whether to enable GPU Driven.
+     * @zh 是否开启 GPU Driven 。
+     */
+    get gpuDrivenEnabled (): boolean {
+        return this._gpuDrivenEnabled;
+    }
+
+    set gpuDrivenEnabled (val) {
+        this._gpuDrivenEnabled = val;
+    }
+
     /**
      * @en The type of the model
      * @zh 模型类型
@@ -577,6 +589,12 @@ export class Model {
      */
     protected _reflectionProbeType = ReflectionProbeType.NONE;
 
+    /**
+     * @en Whether to enable GPU Driven.
+     * @zh 是否开启 GPU Driven 。
+     */
+    protected _gpuDrivenEnabled = true;
+
     /**
      * @internal
      * @en native object

cocos/rendering/custom/pipeline.ts

@@ -1404,8 +1404,10 @@ export interface Pipeline extends BasicPipeline {
     addBuiltinGpuCullingPass (
         cullingID: number,
         camera: Camera,
+        layoutPath?: string,
         hzbName?: string,
         light?: Light | null,
+        level?: number,
         bMainPass?: boolean): void;
     /**
      * @en Add hierarchical z buffer generation pass

cocos/rendering/custom/types.ts

@@ -28,7 +28,7 @@
  * ========================= !DO NOT CHANGE THE FOLLOWING SECTION MANUALLY! =========================
  */
 /* eslint-disable max-len */
-import { ResolveMode, ShaderStageFlagBit, Type, UniformBlock } from '../../gfx';
+import { ResolveMode, ShaderStageFlagBit, Type, UniformBlock, AccessFlags, AccessFlagBit } from '../../gfx';
 import { Light } from '../../render-scene/scene';
 import { OutputArchive, InputArchive } from './archive';
 import { saveUniformBlock, loadUniformBlock } from './serialization';
@@ -475,6 +475,7 @@ export class MovePair {
         targetMostDetailedMip = 0,
         targetFirstSlice = 0,
         targetPlaneSlice = 0,
+        possibleUsage = AccessFlagBit.NONE,
     ) {
         this.source = source;
         this.target = target;
@@ -483,6 +484,7 @@ export class MovePair {
         this.targetMostDetailedMip = targetMostDetailedMip;
         this.targetFirstSlice = targetFirstSlice;
         this.targetPlaneSlice = targetPlaneSlice;
+        this.possibleUsage = possibleUsage;
     }
     source: string;
     target: string;
@@ -491,6 +493,7 @@ export class MovePair {
     targetMostDetailedMip: number;
     targetFirstSlice: number;
     targetPlaneSlice: number;
+    possibleUsage: AccessFlagBit;
 }
 
 export class PipelineStatistics {

cocos/root.ts

@@ -428,12 +428,6 @@ export class Root {
         //-----------------------------------------------
         // pipeline initialization completed
         //-----------------------------------------------
-        const scene = director.getScene();
-        if (scene) {
-            scene.globals.activate();
-        }
-
-        this.onGlobalPipelineStateChanged();
         if (!this._batcher && internal.Batcher2D) {
             this._batcher = new internal.Batcher2D(this);
             if (!this._batcher!.initialize()) {

cocos/scene-graph/scene.jsb.ts

@@ -130,9 +130,6 @@ sceneProto._activate = function (active: boolean) {
     }
     cclegacy.director._nodeActivator.activateNode(this, active);
     // The test environment does not currently support the renderer
-    if (!TEST || EDITOR) {
-        this._globals.activate(this);
-    }
 };
 
 sceneProto._instantiate = function(): void {};

cocos/scene-graph/scene.ts

@@ -191,9 +191,6 @@ export class Scene extends Node {
         }
         cclegacy.director._nodeActivator.activateNode(this, active);
         // The test environment does not currently support the renderer
-        if (!TEST) {
-            this._globals.activate(this);
-        }
     }
 }
 

editor/assets/chunks/builtin/uniforms/cc-light-map.chunk

@@ -1,8 +1,2 @@
-#if CC_USE_GPU_DRIVEN
-  #pragma rate cc_lightingMap pass
-  #pragma glBinding(2)
-  uniform sampler2D cc_lightingMap;
-#else
-  #pragma builtin(local)
-  layout(set = 2, binding = 11) uniform sampler2D cc_lightingMap;
-#endif
+#pragma builtin(local)
+layout(set = 2, binding = 11) uniform sampler2D cc_lightingMap;