From 7bbce32970eb0b68363decd02eef107766149ec8 Mon Sep 17 00:00:00 2001 From: Zhang mingzhen <32831993+Zhmz@users.noreply.github.com> Date: Thu, 4 Aug 2022 22:14:23 +0800 Subject: [PATCH] static drawinfo should be reset when flushing assembler (#12333) * static drawinfo should be reset when flushing assembler * add reset drawinfo method * revert mistake * fix mistakes Co-authored-by: zhangmingzhen --- cocos/2d/framework/ui-renderer.ts | 1 + cocos/2d/renderer/native-2d.ts | 1 + cocos/2d/renderer/render-data.ts | 2 ++ cocos/2d/renderer/render-entity.ts | 6 +++++ native/cocos/2d/renderer/RenderDrawInfo.h | 33 ++++++++++++++++++++--- native/cocos/2d/renderer/RenderEntity.cpp | 10 +++++++ native/cocos/2d/renderer/RenderEntity.h | 1 + native/tools/tojs/2d.ini | 4 +-- 8 files changed, 53 insertions(+), 5 deletions(-) diff --git a/cocos/2d/framework/ui-renderer.ts b/cocos/2d/framework/ui-renderer.ts index 3a93337216..71e03c56c2 100644 --- a/cocos/2d/framework/ui-renderer.ts +++ b/cocos/2d/framework/ui-renderer.ts @@ -366,6 +366,7 @@ export class UIRenderer extends Renderer { if (!this.renderData) { return; } + this.renderData.removeRenderDrawInfo(this); RenderData.remove(this.renderData); this._renderData = null; } diff --git a/cocos/2d/renderer/native-2d.ts b/cocos/2d/renderer/native-2d.ts index e435abd3d8..ebf46cc569 100644 --- a/cocos/2d/renderer/native-2d.ts +++ b/cocos/2d/renderer/native-2d.ts @@ -46,6 +46,7 @@ export declare class NativeRenderEntity { setDynamicRenderDrawInfo(drawInfo: NativeRenderDrawInfo, index: number); removeDynamicRenderDrawInfo(); clearDynamicRenderDrawInfos(); + clearStaticRenderDrawInfos(); get node(): Node | null; set node(node: Node | null); diff --git a/cocos/2d/renderer/render-data.ts b/cocos/2d/renderer/render-data.ts index 896fdaff3c..efca37057a 100644 --- a/cocos/2d/renderer/render-data.ts +++ b/cocos/2d/renderer/render-data.ts @@ -189,6 +189,8 @@ export class BaseRenderData { const renderEntity: RenderEntity = comp.renderEntity; if (renderEntity.renderEntityType === RenderEntityType.DYNAMIC) { renderEntity.removeDynamicRenderDrawInfo(); + } else if (renderEntity.renderEntityType === RenderEntityType.STATIC) { + renderEntity.clearStaticRenderDrawInfos(); } } } diff --git a/cocos/2d/renderer/render-entity.ts b/cocos/2d/renderer/render-entity.ts index 2cfc5c0feb..e303b4eb7a 100644 --- a/cocos/2d/renderer/render-entity.ts +++ b/cocos/2d/renderer/render-entity.ts @@ -152,6 +152,12 @@ export class RenderEntity { } } + public clearStaticRenderDrawInfos () { + if (JSB) { + this._nativeObj.clearStaticRenderDrawInfos(); + } + } + public setDynamicRenderDrawInfo (renderDrawInfo: RenderDrawInfo | null, index: number) { if (JSB) { if (renderDrawInfo) { diff --git a/native/cocos/2d/renderer/RenderDrawInfo.h b/native/cocos/2d/renderer/RenderDrawInfo.h index e85585d2e8..c54366acdf 100644 --- a/native/cocos/2d/renderer/RenderDrawInfo.h +++ b/native/cocos/2d/renderer/RenderDrawInfo.h @@ -45,7 +45,7 @@ struct Render2dLayout { Vec4 color; }; -enum class RenderDrawInfoType: uint8_t { +enum class RenderDrawInfoType : uint8_t { COMP, MODEL, IA, @@ -187,8 +187,8 @@ public: } inline Node* getSubNode() const { - CC_ASSERT(_drawInfoAttrs._drawInfoType == RenderDrawInfoType::SUB_NODE); - return _subNode; + CC_ASSERT(_drawInfoAttrs._drawInfoType == RenderDrawInfoType::SUB_NODE); + return _subNode; } inline void setSubNode(Node* node) { CC_ASSERT(_drawInfoAttrs._drawInfoType == RenderDrawInfoType::SUB_NODE); @@ -218,6 +218,33 @@ public: inline gfx::DescriptorSet* getLocalDes() { return _localDSBF->ds; } void updateLocalDescriptorSet(Node* transform, gfx::DescriptorSetLayout* dsLayout); + inline void resetDrawInfo() { + _drawInfoAttrs._bufferId = 0; + _drawInfoAttrs._accId = 0; + _drawInfoAttrs._vertexOffset = 0; + _drawInfoAttrs._indexOffset = 0; + _drawInfoAttrs._vbCount = 0; + _drawInfoAttrs._ibCount = 0; + _drawInfoAttrs._stride = 0; + _drawInfoAttrs._dataHash = 0; + _drawInfoAttrs._vertDirty = false; + _drawInfoAttrs._isMeshBuffer = false; + + _vbBuffer = nullptr; + _ibBuffer = nullptr; + _vDataBuffer = nullptr; + _iDataBuffer = nullptr; + _material = nullptr; + _texture = nullptr; + _sampler = nullptr; + _subNode = nullptr; + _model = nullptr; + _sharedBuffer = nullptr; + _iaInfo = nullptr; + _iaPool = nullptr; + _localDSBF = nullptr; + } + private: CC_DISALLOW_COPY_MOVE_ASSIGN(RenderDrawInfo); void destroy(); diff --git a/native/cocos/2d/renderer/RenderEntity.cpp b/native/cocos/2d/renderer/RenderEntity.cpp index 7a62f9add0..2c0a017830 100644 --- a/native/cocos/2d/renderer/RenderEntity.cpp +++ b/native/cocos/2d/renderer/RenderEntity.cpp @@ -66,6 +66,16 @@ void RenderEntity::clearDynamicRenderDrawInfos() { _dynamicDrawInfos.clear(); } +void RenderEntity::clearStaticRenderDrawInfos() { + CC_ASSERT(_renderEntityType == RenderEntityType::STATIC); + + for (uint32_t i = 0; i < _staticDrawInfoSize; i++) { + RenderDrawInfo& drawInfo = _staticDrawInfos[i]; + drawInfo.resetDrawInfo(); + } + _staticDrawInfoSize = 0; +} + void RenderEntity::setNode(Node* node) { if (_node) { _node->setUserData(nullptr); diff --git a/native/cocos/2d/renderer/RenderEntity.h b/native/cocos/2d/renderer/RenderEntity.h index 00412167f0..c597aebfdc 100644 --- a/native/cocos/2d/renderer/RenderEntity.h +++ b/native/cocos/2d/renderer/RenderEntity.h @@ -73,6 +73,7 @@ public: void setDynamicRenderDrawInfo(RenderDrawInfo* drawInfo, uint32_t index); void removeDynamicRenderDrawInfo(); void clearDynamicRenderDrawInfos(); + void clearStaticRenderDrawInfos(); inline bool getIsMask() const { return static_cast(_entityAttrLayout.maskMode) == MaskMode::MASK || static_cast(_entityAttrLayout.maskMode) == MaskMode::MASK_INVERTED; diff --git a/native/tools/tojs/2d.ini b/native/tools/tojs/2d.ini index 162bb1702b..cb235d2b46 100644 --- a/native/tools/tojs/2d.ini +++ b/native/tools/tojs/2d.ini @@ -46,10 +46,10 @@ classes = RenderDrawInfo UIMeshBuffer Batcher2d RenderEntity UIModelProxy # add a single "*" as functions. See bellow for several examples. A special class name is "*", which # will apply to all class names. This is a convenience wildcard to be able to skip similar named # functions from all classes. -skip = RenderDrawInfo::[getBatcher setBatcher parseAttrLayout getRender2dLayout getEnumDrawInfoType], +skip = RenderDrawInfo::[getBatcher setBatcher parseAttrLayout getRender2dLayout getEnumDrawInfoType resetDrawInfo], Batcher2d::[addVertDirtyRenderer getMeshBuffer getDevice updateDescriptorSet fillBuffersAndMergeBatches walk generateBatch resetRenderStates handleDrawInfo handleComponentDraw handleModelDraw handleIADraw handleSubNode], UIMeshBuffer::[requireFreeIA createNewIA recycleIA resetIA parseLayout getByteOffset setByteOffset getVertexOffset setVertexOffset getIndexOffset setIndexOffset getDirty setDirty getFloatsPerVertex setFloatsPerVertex getAttributes], - RenderEntity::[getDynamicRenderDrawInfo getDynamicRenderDrawInfos getRenderEntityType getColorDirty getColor isEnabled getEnumStencilStage setEnumStencilStage getVBColorDirty setVBColorDirty] + RenderEntity::[getDynamicRenderDrawInfo getDynamicRenderDrawInfos getRenderEntityType getColorDirty getColor isEnabled getEnumStencilStage setEnumStencilStage getVBColorDirty setVBColorDirty clearStaticRenderDrawInfos] rename_functions =