hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码排版与补齐未初始化变量

Browse Source
This commit is contained in:
hyzboy 2025-06-09 22:47:54 +08:00
parent 0be9cb3f74
commit b5a5cb16c0
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/SceneGraph/Vulkan/VKPrimitiveData.cpp
View File

@ -12,6 +12,7 @@ PrimitiveData::PrimitiveData(const VIL *_vil,const uint32_t vc)
vil=_vil; vil=_vil;
vertex_count=vc; vertex_count=vc;
index_count=0;
vab_list=hgl_zero_new<VAB *>(_vil->GetVertexAttribCount()); vab_list=hgl_zero_new<VAB *>(_vil->GetVertexAttribCount());
vab_map_list=new VABMap[_vil->GetVertexAttribCount()]; vab_map_list=new VABMap[_vil->GetVertexAttribCount()];
@ -60,7 +61,7 @@ VAB *PrimitiveData::InitVAB(const int vab_index,const void *data)
vab_list[vab_index]=CreateVAB(vab_index,vif->format,data); vab_list[vab_index]=CreateVAB(vab_index,vif->format,data);
if(!vab_list[vab_index]) if(!vab_list[vab_index])
return(nullptr); return(nullptr);
} }
else else
{ {
@ -73,7 +74,7 @@ VAB *PrimitiveData::InitVAB(const int vab_index,const void *data)
VABMap *PrimitiveData::GetVABMap(const int vab_index) VABMap *PrimitiveData::GetVABMap(const int vab_index)
{ {
if(vab_index<0||vab_index>=vil->GetVertexAttribCount())return nullptr; if(vab_index<0||vab_index>=vil->GetVertexAttribCount())return nullptr;
VABMap *vab_map=vab_map_list+vab_index; VABMap *vab_map=vab_map_list+vab_index;
if(!vab_map->IsValid()) if(!vab_map->IsValid())
@ -86,8 +87,8 @@ VABMap *PrimitiveData::GetVABMap(const int vab_index)
return vab_map; return vab_map;
} }
IndexBuffer *PrimitiveData::InitIBO(const uint32_t ic,IndexType it) IndexBuffer *PrimitiveData::InitIBO(const int ic,IndexType it)
{ {
if(ibo)delete ibo; if(ibo)delete ibo;
@ -105,7 +106,7 @@ IndexBuffer *PrimitiveData::InitIBO(const uint32_t ic,IndexType it)
void PrimitiveData::UnmapAll() void PrimitiveData::UnmapAll()
{ {
for(int i=0;i<vil->GetVertexAttribCount();i++) for(uint32_t i=0;i<vil->GetVertexAttribCount();i++)
vab_map_list[i].Unmap(); vab_map_list[i].Unmap();
ibo_map.Unmap(); ibo_map.Unmap();
@ -151,12 +152,12 @@ namespace
} }
IndexBuffer *CreateIBO(const uint32_t ic,const IndexType &it) override IndexBuffer *CreateIBO(const uint32_t ic,const IndexType &it) override
{ {
if(!device)return(nullptr); if(!device)return(nullptr);
return device->CreateIBO(it,ic); return device->CreateIBO(it,ic);
} }
VAB *CreateVAB(const int vab_index,const VkFormat format,const void *data) override VAB *CreateVAB(const int vab_index,const VkFormat format,const void *data) override
{ {
if(!device)return(nullptr); if(!device)return(nullptr);
@ -177,9 +178,9 @@ namespace
public: public:
int32_t GetVertexOffset()const override { return vab_node->GetStart(); } int32_t GetVertexOffset ()const override{return vab_node->GetStart();}
uint32_t GetFirstIndex ()const override { return ib_node->GetStart(); } uint32_t GetFirstIndex ()const override{return ib_node->GetStart();}
VertexDataManager * GetVDM()const override{return vdm;} ///<取得顶点数据管理器 VertexDataManager * GetVDM ()const override{return vdm;} ///<取得顶点数据管理器
public: public:
@ -199,7 +200,7 @@ namespace
if(vab_node) if(vab_node)
vdm->ReleaseVAB(vab_node); vdm->ReleaseVAB(vab_node);
} }
IndexBuffer *CreateIBO(const uint32_t ic,const IndexType &it) override IndexBuffer *CreateIBO(const uint32_t ic,const IndexType &it) override
{ {
if(!vdm) if(!vdm)

2
src/SceneGraph/Vulkan/VKPrimitiveData.h
View File

@ -54,7 +54,7 @@ public:
VAB * InitVAB (const int vab_index,const void *data); VAB * InitVAB (const int vab_index,const void *data);
VABMap * GetVABMap (const int vab_index); VABMap * GetVABMap (const int vab_index);
IndexBuffer * InitIBO(const uint32_t index_count,IndexType it); IndexBuffer * InitIBO (const int index_count,IndexType it);
IndexBuffer * GetIBO (){return ibo;} IndexBuffer * GetIBO (){return ibo;}
IBMap * GetIBMap (){return &ibo_map;} IBMap * GetIBMap (){return &ibo_map;}
uint32_t GetIndexCount ()const{return index_count;} uint32_t GetIndexCount ()const{return index_count;}