mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
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 <mingzhen.zhang@cocos.com>
This commit is contained in:
@@ -366,6 +366,7 @@ export class UIRenderer extends Renderer {
|
||||
if (!this.renderData) {
|
||||
return;
|
||||
}
|
||||
this.renderData.removeRenderDrawInfo(this);
|
||||
RenderData.remove(this.renderData);
|
||||
this._renderData = null;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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<MaskMode>(_entityAttrLayout.maskMode) == MaskMode::MASK || static_cast<MaskMode>(_entityAttrLayout.maskMode) == MaskMode::MASK_INVERTED;
|
||||
|
||||
@@ -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 =
|
||||
|
||||
|
||||
Reference in New Issue
Block a user