V3.7.3 hw

.github/workflows/run_test_cases.yml

@@ -104,9 +104,9 @@ jobs:
         shell: bash
         run: |
           set -x
-          AUTOTEST_VERSION="v3.7"
-          TEST_PROJECTS_EXTERNAL="../../cocos-test-projects"
-          CCTEST_PLUGINS="../../TestAction"
+          AUTOTEST_VERSION=`echo ${{ steps.parse_pr.outputs.pr_base_ref }} | cut -b -4`
+          TEST_PROJECTS_EXTERNAL="E:/pr-test/cocos-test-projects"
+          CCTEST_PLUGINS="E:/pr-test/TestPlugin"
           if [ ! -d $TEST_PROJECTS_EXTERNAL ]; then
               mkdir -p $TEST_PROJECTS_EXTERNAL
               git clone https://github.com/cocos/cocos-test-projects.git $TEST_PROJECTS_EXTERNAL
@@ -118,9 +118,7 @@ jobs:
           git -C $TEST_PROJECTS_EXTERNAL checkout origin/$AUTOTEST_VERSION
           git -C $TEST_PROJECTS_EXTERNAL pull origin $AUTOTEST_VERSION --allow-unrelated-histories
           rm -rf $TEST_PROJECTS_EXTERNAL/extensions/automation-framework
-          7z x -y $CCTEST_PLUGINS/*.zip -o $TEST_PROJECTS_EXTERNAL/extensions/automation-framework
-
-
+          7z x -y $CCTEST_PLUGINS/*.zip -o$TEST_PROJECTS_EXTERNAL/extensions/automation-framework
   macOS-RunTestCases:
     if: |
       contains(github.event.pull_request.body, '[X] needs automatic test cases check') ||
@@ -166,7 +164,6 @@ jobs:
           echo "${{ steps.parse_pr.outputs.pr_head_sha }}"
           echo "${{ steps.parse_pr.outputs.pr_base_ref }}"
           echo "${{ steps.parse_pr.outputs.pr_base_sha }}"
-
       - name: Checkout engine
         uses: actions/checkout@v3
         with:
@@ -218,9 +215,9 @@ jobs:
         shell: bash
         run: |
           set -x
-          AUTOTEST_VERSION="v3.7"
+          AUTOTEST_VERSION=`echo ${{ steps.parse_pr.outputs.pr_base_ref }} | cut -b -4`
           TEST_PROJECTS_EXTERNAL="../../cocos-test-projects"
-          CCTEST_PLUGINS="../../TestAction"
+          CCTEST_PLUGINS="../../TestPlugin"
           if [ ! -d $TEST_PROJECTS_EXTERNAL ]; then
               mkdir -p $TEST_PROJECTS_EXTERNAL
               git clone https://github.com/cocos/cocos-test-projects.git $TEST_PROJECTS_EXTERNAL
@@ -233,21 +230,55 @@ jobs:
           git -C $TEST_PROJECTS_EXTERNAL pull origin $AUTOTEST_VERSION --allow-unrelated-histories
           rm -rf $TEST_PROJECTS_EXTERNAL/extensions/automation-framework
           unzip -oq $CCTEST_PLUGINS/*.zip -d $TEST_PROJECTS_EXTERNAL/extensions/automation-framework
-
   Creator-PR-RunTestCases:
     runs-on: self-hosted-mac
     needs: [macOS-RunTestCases, Win-RunTestCases]
     steps:
+      - name: Get PR Number
+        id: get_pr
+        shell: pwsh
+        run: |
+          if ("${{ github.event_name }}" -eq "issue_comment") {
+            Write-Host "::set-output name=pr_number::${{ github.event.issue.number }}"
+          }
+          else {
+            Write-Host "::set-output name=pr_number::${{ github.event.pull_request.number }}"
+          }
+      - name: Get PR Details
+        id: pr_deatils
+        uses: octokit/[email protected]
+        with:
+          route: GET /repos/cocos/cocos-engine/pulls/${{ steps.get_pr.outputs.pr_number }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Parse Pull Request
+        id: parse_pr
+        shell: pwsh
+        run: |
+          $pull_request = @"
+          ${{ steps.pr_deatils.outputs.data }}
+          "@ | ConvertFrom-Json
+          Write-Host $pull_request
+          Write-Host "::set-output name=pr_html_url::$($pull_request.html_url)"
+          Write-Host "::set-output name=pr_author::$($pull_request.user.login)"
+          Write-Host "::set-output name=pr_head_ref::$($pull_request.head.ref)"
+          Write-Host "::set-output name=pr_head_sha::$($pull_request.head.sha)"
+          Write-Host "::set-output name=pr_base_ref::$($pull_request.base.ref)"
+          Write-Host "::set-output name=pr_base_sha::$($pull_request.base.sha)"
+      - name: Check Job Parameter
+        run: |
+          echo "${{ steps.parse_pr.outputs.pr_head_ref }}"
+          echo "${{ steps.parse_pr.outputs.pr_head_sha }}"
+          echo "${{ steps.parse_pr.outputs.pr_base_ref }}"
+          echo "${{ steps.parse_pr.outputs.pr_base_sha }}"
       - name: Run test cases
         timeout-minutes: 90
         id: run_test_cases
         run: |
-          sed -x
-          node  ../../test-projects/extensions/automation-framework/node_modules/@cctest/scheduler/dist/cli.js cicd -p PR-TEST -v ${{ steps.parse_pr.outputs.pr_base_ref }}  -r  test-cctest.cocos.org
-          JOBID='cat ../../test-projects/extensions/automation-framework/node_modules/@cctest/scheduler/logs/PR-TEST/nowJobId.log'
+          scheduler cicd -p PR-TEST -v ${{ steps.parse_pr.outputs.pr_base_ref }} -g PR-TEST -r cctest.cocos.org 
+          JOBID=`cat  /usr/local/lib/node_modules/@cctest/scheduler/logs/PR-TEST/nowJobId.log`
           cd ..
-          python3 -u ./python/main.py -target=job_result --jobid=$JOBID
-
+          python3 -u ./python/main.py --target=job_editor --jobid=$JOBID
       - name: Update Comment
         uses: peter-evans/create-or-update-comment@v1
         with:
@@ -256,8 +287,8 @@ jobs:
             @${{ steps.parse_pr.outputs.pr_author }}, Please check the result of `run test cases`:
             - Test Platform: PR-Test
             - Editor Version: ${{ steps.run_test_cases.outputs.editor }}
-            # - Task Result: ${{ steps.run_test_cases.outputs.task }}
-            # - Task URL: ${{ steps.run_test_cases.outputs.url }}
+            - Task Result: ${{ steps.run_test_cases.outputs.status }}
+            - Task URL: http://cctest.cocos.org/#/reportview/PR-TEST/${{ steps.run_test_cases.outputs.jobid }}/-1
             - GitHub Action: https://github.com/cocos/cocos-engine/actions/runs/${{ github.run_id }}
             ## Task Details
             ${{ steps.run_test_cases.outputs.report }}

EngineErrorMap.md

@@ -1845,6 +1845,22 @@ Previous error occurred when instantiating animation clip %s on node %s.
 
 '%s' is not found from '%s'. It's specified as the root node to play animation clip '%s'.
 
+### 3940
+
+Error when animation attempted to bind material uniform target: target %s is not a material.
+
+### 3941
+
+Error when animation attempted to bind material uniform target: material %s has no recorded pass %s.
+
+### 3942
+
+Error when animation attempted to bind material uniform target: material %s at pass %s has no recorded uniform %s.
+
+### 3943
+
+Error when animation attempted to bind material uniform target: material %s at pass %s's uniform %s has no recorded channel %s.
+
 ### 4000
 
 <!-- DEPRECATED -->

cocos/animation/tracks/track.ts

@@ -389,6 +389,9 @@ export class TrackBinding {
                 return null;
             }
             const runtimeProxy = proxy.forTarget(resultTarget);
+            if (!runtimeProxy) {
+                return null;
+            }
             const binding: RuntimeBinding = {
                 setValue: (value) => {
                     runtimeProxy.set(value);

cocos/animation/value-proxy-factories/uniform.ts

@@ -31,7 +31,7 @@ import { deviceManager, Type } from '../../gfx';
 import { Pass } from '../../render-scene/core/pass';
 import { getDefaultFromType, getStringFromType } from '../../render-scene/core/pass-utils';
 import { IValueProxy, IValueProxyFactory } from '../value-proxy';
-import { warn } from '../../core';
+import { warn, warnID } from '../../core';
 
 /**
  * @en
@@ -73,19 +73,38 @@ export class UniformProxyFactory implements IValueProxyFactory {
         this.uniformName = uniformName || '';
     }
 
-    public forTarget (target: Material): IValueProxy {
-        const pass = target.passes[this.passIndex];
-        const handle = pass.getHandle(this.uniformName);
+    public forTarget (target: unknown): IValueProxy | undefined {
+        if (!(target instanceof Material)) {
+            warnID(3940, target);
+            return undefined;
+        }
+
+        const {
+            passIndex,
+            uniformName,
+            channelIndex,
+        } = this;
+
+        if (passIndex < 0 || passIndex >= target.passes.length) {
+            warnID(3941, target.name, passIndex);
+            return undefined;
+        }
+
+        const pass = target.passes[passIndex];
+        const handle = pass.getHandle(uniformName);
         if (!handle) {
-            throw new Error(`Material "${target.name}" has no uniform "${this.uniformName}"`);
+            warnID(3942, target.name, passIndex, uniformName);
+            return undefined;
         }
+
         const type = Pass.getTypeFromHandle(handle);
         if (type < Type.SAMPLER1D) {
-            const realHandle = this.channelIndex === undefined ? handle : pass.getHandle(this.uniformName, this.channelIndex, Type.FLOAT);
+            const realHandle = channelIndex === undefined ? handle : pass.getHandle(uniformName, channelIndex, Type.FLOAT);
             if (!realHandle) {
-                throw new Error(`Uniform "${this.uniformName} (in material ${target.name}) has no channel ${this.channelIndex!}"`);
+                warnID(3943, target.name, passIndex, uniformName, channelIndex);
+                return undefined;
             }
-            if (isUniformArray(pass, this.uniformName)) {
+            if (isUniformArray(pass, uniformName)) {
                 return {
                     set: (value: any) => {
                         pass.setUniformArray(realHandle, value);
@@ -99,7 +118,7 @@ export class UniformProxyFactory implements IValueProxyFactory {
             };
         } else {
             const binding = Pass.getBindingFromHandle(handle);
-            const prop = pass.properties[this.uniformName];
+            const prop = pass.properties[uniformName];
             const texName = prop && prop.value ? `${prop.value as string}${getStringFromType(prop.type)}` : getDefaultFromType(prop.type) as string;
             let dftTex = builtinResMgr.get<TextureBase>(texName);
             if (!dftTex) {

cocos/animation/value-proxy.ts

@@ -56,6 +56,8 @@ export interface IValueProxyFactory {
      * @zh
      * 返回指定目标的曲线值代理。
      * @param target The target acquiring the value proxy.
+     * @returns The value proxy, or undefined if the proxy could not be created.
+     * In later case, a warn should be given before returning.
      */
-    forTarget (target: any): IValueProxy;
+    forTarget (target: any): IValueProxy | undefined;
 }

cocos/asset/assets/material.ts

@@ -348,7 +348,7 @@ export class Material extends Asset {
                 if (name in props) { return props[name]; }
             }
         } else {
-            if (passIdx >= this._props.length) { console.warn(`illegal pass index: ${passIdx}.`); return null; }
+            if (passIdx >= this._passes.length) { console.warn(`illegal pass index: ${passIdx}.`); return null; }
             const props = this._props[this._passes[passIdx].propertyIndex];
             if (name in props) { return props[name]; }
         }

cocos/gfx/base/define.ts

@@ -1581,24 +1581,16 @@ export class SubpassDependency {
         public srcSubpass: number = 0,
         public dstSubpass: number = 0,
         public generalBarrier: GeneralBarrier = null!,
-        public bufferBarriers: BufferBarrier = null!,
-        public buffers: Buffer = null!,
-        public bufferBarrierCount: number = 0,
-        public textureBarriers: TextureBarrier = null!,
-        public textures: Texture = null!,
-        public textureBarrierCount: number = 0,
+        public prevAccesses: AccessFlags[] = [AccessFlagBit.NONE],
+        public nextAccesses: AccessFlags[] = [AccessFlagBit.NONE],
     ) {}
 
     public copy (info: Readonly<SubpassDependency>) {
         this.srcSubpass = info.srcSubpass;
         this.dstSubpass = info.dstSubpass;
         this.generalBarrier = info.generalBarrier;
-        this.bufferBarriers = info.bufferBarriers;
-        this.buffers = info.buffers;
-        this.bufferBarrierCount = info.bufferBarrierCount;
-        this.textureBarriers = info.textureBarriers;
-        this.textures = info.textures;
-        this.textureBarrierCount = info.textureBarrierCount;
+        this.prevAccesses = info.prevAccesses.slice();
+        this.nextAccesses = info.nextAccesses.slice();
         return this;
     }
 }

cocos/gfx/webgl/webgl-commands.ts

@@ -2101,7 +2101,7 @@ export function WebGLCmdFuncBindStates (
             }
 
             if (!vf32) {
-                error(`Buffer binding '${glBlock.name}' at set ${glBlock.set} binding ${glBlock.binding} is not bounded`);
+                // error(`Buffer binding '${glBlock.name}' at set ${glBlock.set} binding ${glBlock.binding} is not bounded`);
                 continue;
             }
 
@@ -2274,7 +2274,7 @@ export function WebGLCmdFuncBindStates (
                 const texUnit = glSampler.units[l];
 
                 if (!gpuDescriptor || !gpuDescriptor.gpuSampler) {
-                    error(`Sampler binding '${glSampler.name}' at set ${glSampler.set} binding ${glSampler.binding} index ${l} is not bounded`);
+                    // error(`Sampler binding '${glSampler.name}' at set ${glSampler.set} binding ${glSampler.binding} index ${l} is not bounded`);
                     continue;
                 }
 

cocos/gfx/webgl2/webgl2-commands.ts

@@ -2360,7 +2360,7 @@ export function WebGL2CmdFuncBindStates (
             const gpuDescriptor = descriptorIndex >= 0 && gpuDescriptorSet.gpuDescriptors[descriptorIndex];
 
             if (!gpuDescriptor || !gpuDescriptor.gpuBuffer) {
-                error(`Buffer binding '${glBlock.name}' at set ${glBlock.set} binding ${glBlock.binding} is not bounded`);
+                // error(`Buffer binding '${glBlock.name}' at set ${glBlock.set} binding ${glBlock.binding} is not bounded`);
                 continue;
             }
 
@@ -2395,7 +2395,7 @@ export function WebGL2CmdFuncBindStates (
                 const glTexUnit = cache.glTexUnits[texUnit];
 
                 if (!gpuDescriptor || !gpuDescriptor.gpuTextureView || !gpuDescriptor.gpuTextureView.gpuTexture || !gpuDescriptor.gpuSampler) {
-                    error(`Sampler binding '${glSampler.name}' at set ${glSampler.set} binding ${glSampler.binding} index ${l} is not bounded`);
+                    // error(`Sampler binding '${glSampler.name}' at set ${glSampler.set} binding ${glSampler.binding} index ${l} is not bounded`);
                     continue;
                 }
 

cocos/rendering/custom/builtin-pipelines.ts

@@ -24,13 +24,13 @@
 
 import { EDITOR } from 'internal:constants';
 import { Camera, CameraUsage } from '../../render-scene/scene';
-import { Pipeline, PipelineBuilder } from './pipeline';
+import { BasicPipeline, PipelineBuilder } from './pipeline';
 import { buildForwardPass, buildGBufferPass, buildLightingPass, buildPostprocessPass,
     buildReflectionProbePasss, buildUIPass } from './define';
 import { isUICamera } from './utils';
 
 export class ForwardPipelineBuilder implements PipelineBuilder {
-    public setup (cameras: Camera[], ppl: Pipeline): void {
+    public setup (cameras: Camera[], ppl: BasicPipeline): void {
         for (let i = 0; i < cameras.length; i++) {
             const camera = cameras[i];
             if (camera.scene === null) {
@@ -46,7 +46,7 @@ export class ForwardPipelineBuilder implements PipelineBuilder {
 }
 
 export class DeferredPipelineBuilder implements PipelineBuilder {
-    public setup (cameras: Camera[], ppl: Pipeline): void {
+    public setup (cameras: Camera[], ppl: BasicPipeline): void {
         for (let i = 0; i < cameras.length; ++i) {
             const camera = cameras[i];
             if (!camera.scene) {

cocos/rendering/custom/compiler.ts

@@ -27,7 +27,7 @@ import { assert, warn } from '../../core';
 import { VectorGraphColorMap } from './effect';
 import { DefaultVisitor, depthFirstSearch, ReferenceGraphView } from './graph';
 import { LayoutGraphData } from './layout-graph';
-import { Pipeline } from './pipeline';
+import { BasicPipeline } from './pipeline';
 import { Blit, ClearView, ComputePass, ComputeSubpass, CopyPass, Dispatch, ManagedBuffer, ManagedResource, ManagedTexture, MovePass,
     RasterPass, RasterSubpass, RaytracePass, RenderGraph, RenderGraphVisitor,
     RenderQueue, RenderSwapchain, ResourceGraph, ResourceGraphObject, ResourceGraphVisitor, ResourceTraits, SceneData } from './render-graph';
@@ -287,7 +287,7 @@ class ResourceUseContext {
     computes: Map<number, [ComputeView[]]> = new Map<number, [ComputeView[]]>();
 }
 class CompilerContext {
-    set (pipeline: Pipeline,
+    set (pipeline: BasicPipeline,
         resGraph: ResourceGraph,
         renderGraph: RenderGraph,
         layoutGraph: LayoutGraphData) {
@@ -309,9 +309,9 @@ class CompilerContext {
 
 export class Compiler {
     private _resourceGraph: ResourceGraph;
-    private _pipeline: Pipeline;
+    private _pipeline: BasicPipeline;
     private _layoutGraph: LayoutGraphData;
-    constructor (pipeline: Pipeline,
+    constructor (pipeline: BasicPipeline,
         resGraph: ResourceGraph,
         layoutGraph: LayoutGraphData) {
         this._pipeline = pipeline;
@@ -328,6 +328,9 @@ export class Compiler {
                 const resId = this._resourceGraph.vertex(name);
                 const trait = this._resourceGraph.getTraits(resId);
                 const rasterArr: number[] = Array.from(use.rasters.keys());
+                if (!rasterArr.length) {
+                    continue;
+                }
 
                 const min = rasterArr.reduce((prev, current) => (prev < current ? prev : current));
                 const firstRaster = use.rasters.get(min)!;