test ci

Author: star-e

.github/workflows/generate-oh-sdk-cache.yml

@@ -22,7 +22,7 @@ jobs:
         id: cache-oh-sdk
         uses: actions/cache@v4
         env:
-          cache-name: cache-oh-sdk-21
+          cache-name: cache-oh-sdk-15
         with:
           path: ${{ steps.oh-sdk-cache-dir-path.outputs.dir }}
           key: ${{ runner.os }}-build-${{ env.cache-name }}
@@ -33,11 +33,11 @@ jobs:
         run: |
           if [ ! -d "$HOME/openharmony" ]; then
             mkdir -p $HOME/openharmony
-            echo "Download commandline-tools-linux-x64-6.0.1.246.zip ..."
-            wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-21/commandline-tools-linux-x64-6.0.1.246.zip.001
-            wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-21/commandline-tools-linux-x64-6.0.1.246.zip.002
-            echo "Unzip commandline-tools-linux-x64-6.0.1.246.zip ..."
-            7z x commandline-tools-linux-x64-6.0.1.246.zip.001 -o$HOME/openharmony > /dev/null
+            echo "Download commandline-tools-linux-x64-5.0.13.200.zip ..."
+            wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-15/commandline-tools-linux-x64-5.0.13.200.zip.001
+            wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-15/commandline-tools-linux-x64-5.0.13.200.zip.002
+            echo "Unzip commandline-tools-linux-x64-5.0.13.200.zip ..."
+            7z x commandline-tools-linux-x64-5.0.13.200.zip.001 -o$HOME/openharmony > /dev/null
             cd $HOME/openharmony
             ls -l
             cd command-line-tools

.github/workflows/native-compile-platforms.yml

@@ -296,7 +296,6 @@ jobs:
 
       - name: Install libgl1
         run: |
-          sudo apt-get update
           sudo apt-get install -y libgl1
 
       - name: Checking libGL.so.1
@@ -329,7 +328,7 @@ jobs:
         id: cache-oh-sdk
         uses: actions/cache@v4
         env:
-          cache-name: cache-oh-sdk-21
+          cache-name: cache-oh-sdk-13
         with:
           path: ${{ steps.oh-sdk-cache-dir-path.outputs.dir }}
           key: ${{ runner.os }}-build-${{ env.cache-name }}
@@ -348,11 +347,11 @@ jobs:
         run: |
           if [ ! -d "$HOME/openharmony" ]; then
             mkdir -p $HOME/openharmony
-            echo "Download commandline-tools-linux-x64-6.0.1.246.zip ..."
-            wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-21/commandline-tools-linux-x64-6.0.1.246.zip.001
-            wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-21/commandline-tools-linux-x64-6.0.1.246.zip.002
-            echo "Unzip commandline-tools-linux-x64-6.0.1.246.zip ..."
-            7z x commandline-tools-linux-x64-6.0.1.246.zip.001 -o$HOME/openharmony > /dev/null
+            echo "Download commandline-tools-linux-x64-5.0.13.200.zip ..."
+            wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-15/commandline-tools-linux-x64-5.0.13.200.zip.001
+            wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-15/commandline-tools-linux-x64-5.0.13.200.zip.002
+            echo "Unzip commandline-tools-linux-x64-5.0.13.200.zip ..."
+            7z x commandline-tools-linux-x64-5.0.13.200.zip.001 -o$HOME/openharmony > /dev/null
             cd $HOME/openharmony
             ls -l
             cd command-line-tools

cocos/2d/components/label.ts

@@ -1027,7 +1027,7 @@ export class Label extends UIRenderer {
         if (!this.renderData) {
             if (this._assembler && this._assembler.createData) {
                 this._renderData = this._assembler.createData(this) as RenderData;
-                this.renderData!.material = this.getRenderMaterial(0);
+                this.renderData!.material = this.material;
                 this._updateColor();
             }
         }

cocos/2d/components/sprite.ts

@@ -24,7 +24,7 @@
 */
 
 import { ccclass, help, executionOrder, menu, tooltip, displayOrder, type, range, editable, serializable, visible } from 'cc.decorator';
-import { BUILD, JSB, EDITOR } from 'internal:constants';
+import { BUILD, EDITOR } from 'internal:constants';
 import { SpriteAtlas } from '../assets/sprite-atlas';
 import { SpriteFrame, SpriteFrameEvent } from '../assets/sprite-frame';
 import { builtinResMgr } from '../../asset/asset-manager/builtin-res-mgr';
@@ -703,7 +703,6 @@ export class Sprite extends UIRenderer {
             }
             if (textureChanged) {
                 if (self.renderData) self.renderData.textureDirty = true;
-                if (JSB) this._colorDirty();
                 // texture type changed, set this._instanceMaterialType to default value
                 const oldIsRT = oldFrame ? oldFrame.texture instanceof RenderTexture : false;
                 const newIsRT = spriteFrame.texture instanceof RenderTexture;

cocos/2d/framework/ui-renderer.ts

@@ -398,7 +398,9 @@ export class UIRenderer extends Renderer {
         this.node.off(NodeEventType.ANCHOR_CHANGED, this._nodeStateChange, this);
         this.node.off(NodeEventType.SIZE_CHANGED, this._nodeStateChange, this);
         this.node.off(NodeEventType.PARENT_CHANGED, this._colorDirty, this);
-        this.destroyRenderData();
+        // When disabling, it is necessary to free up idle space to fully utilize chunks
+        // and avoid breaking batch processing.
+        this._destroyData();
         uiRendererManager.removeRenderer(this);
         this._renderFlag = false;
         this._renderEntity.enabled = false;
@@ -542,8 +544,10 @@ export class UIRenderer extends Renderer {
     }
 
     protected _updateColor (): void {
-        this._colorDirty();
+        this.node._uiProps.colorDirty = true;
+        this.setEntityColorDirty(true);
         this.setEntityColor(this._color);
+
         const assembler = this._assembler;
         if (assembler) {
             if (assembler.updateColor) {

cocos/2d/renderer/mesh-buffer.ts

@@ -23,7 +23,7 @@
 */
 
 import { JSB } from 'internal:constants';
-import { Device, BufferUsageBit, MemoryUsageBit, Attribute, Buffer, BufferInfo, InputAssembler, InputAssemblerInfo, Feature, API } from '../../gfx';
+import { Device, BufferUsageBit, MemoryUsageBit, Attribute, Buffer, BufferInfo, InputAssembler, InputAssemblerInfo } from '../../gfx';
 import { getAttributeStride } from './vertex-format';
 import { sys, getError, warnID, assertIsTrue } from '../../core';
 import { NativeUIMeshBuffer } from './native-2d';
@@ -251,12 +251,7 @@ export class MeshBuffer {
 
         this.floatsPerVertex = getAttributeStride(attrs) >> 2;
 
-        var vDataCountLimit = 65536; // 2^16 - 1
-        const glApi = device.gfxAPI;
-        if (glApi === API.WEBGPU || glApi === API.WEBGL2 || glApi === API.WEBGL && device.hasFeature(Feature.ELEMENT_INDEX_UINT)) {
-            vDataCountLimit = 4294967295; // 2^32 - 1
-        }
-        assertIsTrue(this._initVDataCount / this._floatsPerVertex < vDataCountLimit, getError(9005));
+        assertIsTrue(this._initVDataCount / this._floatsPerVertex < 65536, getError(9005));
 
         if (!this.vData || !this.iData) {
             this.vData = new Float32Array(this._initVDataCount);

cocos/asset/assets/image-asset.jsb.ts

@@ -125,8 +125,10 @@ imageAssetProto._setRawAsset = function (filename: string, inLibrary = true) {
 imageAssetProto.reset = function (data: any) {
     this._nativeData = data;
 
-    if (data.format !== undefined && !this.isFormatFixed()) {
-        this.format = (data as any).format;
+    if (!(data instanceof jsbWindow.HTMLElement)) {
+        if(data.format !== undefined) {
+            this.format = (data as any).format;
+        }
     }
     this._syncDataToNative();
 };
@@ -265,7 +267,8 @@ imageAssetProto._deserialize = function (data: any) {
 
     if (ext) {
         this._setRawAsset(ext);
-        this.setFixedFormat(format);
+        this.format = format;
+        // this._format = format;
     } else {
         warnID(3121);
     }

cocos/core/platform/macro.ts

@@ -1066,25 +1066,17 @@ interface Macro {
     ENABLE_WEBGL_HIGHP_STRUCT_VALUES: boolean;
 
     /**
-     * @zh Batcher2D 中每个渲染批次的内存增量（KB）
-     * 增大此值能使参与渲染合批的 2d 渲染组件数量增加，但是每次增加渲染批次的内存增量也会变大。
-     * 这个值决定每个 2D 渲染批次的顶点数量，计算公式为 vCount = Math.floor(macro.BATCHER2D_MEM_INCREMENT * 1024 / 9 * 4);
-     * WebGL2 & WebGPU 等渲染后端的最大顶点数量通常是 2^32 - 1，即 4294967295。
-     * WebGL1 渲染后端的最大顶点数量通常是 2^16 - 1，即 65535。引擎使用拓展 OES_element_index_uint 突破了这个限制，最大顶点数量也可达到 2^32 - 1。
-     * 所以 macro.BATCHER2D_MEM_INCREMENT 的理论最大值为 150994943，但是因为所运行平台的 js 引擎对 Float32Array|Uint16Array 的最大长度有限制，实际最大值往往会小于 2^32 - 1。
-     * 建议最大值不超过 1048576 kb (1GB)，否则会因为 js 引擎的限制而导致 buffer 创建失败。
-     * @en Memory increment (KB) for each rendering batch in Batcher2D
-     * Increasing this value can increase the number of 2D rendering components involved in rendering batching, but the memory increment for each additional rendering batch will also become larger.
-     * This value determines the number of vertices in each 2D rendering batch, calculated as vCount = Math.floor(macro.BATCHER2D_MEM_INCREMENT * 1024 / 9 * 4);
-     * The maximum number of vertices for rendering backends such as WebGL2 & WebGPU is usually 2^32 - 1, which is 4294967295.
-     * The maximum number of vertices for the WebGL1 rendering backend is usually 2^16 - 1, which is 65535. The engine uses the extension OES_element_index_uint to break this limit, and the maximum number of vertices can also reach 2^32 - 1.
-     * Therefore, the theoretical maximum value of macro.BATCHER2D_MEM_INCREMENT is 150994943. However, due to the limitations of the JS engine on the maximum length of Float32Array|Uint16Array on the running platform, the actual maximum value is often less than 2^32 - 1.
-     * It is recommended that the maximum value does not exceed 1048576 kb (1GB); otherwise, buffer creation will fail due to JS engine limitations.
-     * @example
-     * ```typescript
-     * import { macro } from 'cc';
-     * macro.BATCHER2D_MEM_INCREMENT = 4096; //4096 KB
-     * ```
+     * @zh Batcher2D 中内存增量的大小（KB）
+     * 这个值决定了当场景中存在的 2d 渲染组件的顶点数量超过当前 batcher2D 中可容纳的顶点数量时，内存扩充的增加量
+     * 这个值越大，共用同一个 meshBuffer 的 2d 渲染组件数量会更多，但每次扩充所占用的内存也会更大
+     * 默认值在标准格式（[[VertexFormat.vfmtPosUvColor]]）下可容纳 4096 个顶点（4096*9*4/1024），你可以增加容量来提升每个批次可容纳的元素数量
+     * @en The MeshBuffer chunk size in Batcher2D (KB)
+     * This value determines the increase in memory expansion,
+     * when the number of vertices of 2d rendering components present in the scene exceeds the number of vertices,
+     * that can be accommodated in the current batcher2D.
+     * The larger this value is, the more 2d rendering components will share the same meshBuffer, but the more memory will be used for each expansion
+     * The default size can contain 4096 standard vertex ([[VertexFormat.vfmtPosUvColor]]) in one buffer,
+     * you can user larger buffer size to increase the elements count per 2d draw batch.
      * @default 144 KB
      */
     BATCHER2D_MEM_INCREMENT: number;

cocos/misc/index.ts

@@ -29,5 +29,6 @@ export { ModelRenderer } from './model-renderer';
 export { Renderer } from './renderer';
 export { MissingScript } from './missing-script';
 export { PrefabLink } from './prefab-link';
+
 /** deprecated */
 export * from './deprecated';

cocos/particle-2d/motion-streak-2d-assembler.ts

@@ -155,15 +155,15 @@ class MotionStreakAssembler implements IAssembler {
 
         renderData.resize(vertexCount, indexCount); // resize
 
-        if (JSB && comp.texture) {
+        if (JSB) {
             const indexCount = renderData.indexCount;
             this.createQuadIndices(comp, indexCount);
             renderData.chunk.setIndexBuffer(QUAD_INDICES!);
 
             //  Fill all dataList to vData
             this.updateWorldVertexAllData(comp);
 
-            renderData.updateRenderData(comp, comp.texture);
+            renderData.updateRenderData(comp, comp.texture!);
             comp._markForUpdateRenderData();
         }
     }