From 2eac17ac611e8608e8f392e0fee67a15fa27788a Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Fri, 5 May 2023 21:11:39 +0800 Subject: [PATCH] removed VertexInputDataGroup, Renderable only have basic vertexinputdata --- inc/hgl/graph/VKRenderable.h | 47 +++++++++++++------------ src/SceneGraph/Vulkan/VKRenderable.cpp | 48 +++++++++----------------- 2 files changed, 42 insertions(+), 53 deletions(-) diff --git a/inc/hgl/graph/VKRenderable.h b/inc/hgl/graph/VKRenderable.h index f75da6cd..9a109734 100644 --- a/inc/hgl/graph/VKRenderable.h +++ b/inc/hgl/graph/VKRenderable.h @@ -9,26 +9,38 @@ #include #include VK_NAMESPACE_BEGIN - struct VertexInputData { - uint32_t first_binding; uint32_t binding_count; VkBuffer *buffer_list; VkDeviceSize *buffer_offset; -}; -struct VertexInputDataGroup -{ - const VIL *vil; + uint32_t vertex_count; - VertexInputData vid[size_t(VertexInputGroup::RANGE_SIZE)]; + const IndexBufferData *index_buffer; public: - VertexInputDataGroup(const VIL *); - ~VertexInputDataGroup(); -}; + VertexInputData(const uint32_t,const uint32_t,const IndexBufferData *); + ~VertexInputData(); + + const bool Comp(const VertexInputData *vid)const + { + if(binding_count!=vid->binding_count)return(false); + + for(uint32_t i=0;ibuffer_list[i])return(false); + if(buffer_offset[i]!=vid->buffer_offset[i])return(false); + } + + if(vertex_count!=vid->vertex_count)return(false); + + if(index_buffer!=vid->index_buffer)return(false); + + return(true); + } +};//struct VertexInputData /** * 可渲染对象
@@ -39,13 +51,13 @@ class Renderable MaterialInstance * mat_inst; Primitive * primitive; - VertexInputDataGroup *vid_group; + VertexInputData * vertex_input; private: friend Renderable *CreateRenderable(Primitive *,MaterialInstance *,Pipeline *); - Renderable(Primitive *,MaterialInstance *,Pipeline *,VertexInputDataGroup *); + Renderable(Primitive *,MaterialInstance *,Pipeline *,VertexInputData *); public: @@ -60,16 +72,7 @@ public: Primitive * GetPrimitive (){return primitive;} const AABB & GetBoundingBox ()const{return primitive->GetBoundingBox();} - const VertexInputData * GetVertexInputData (const VertexInputGroup &vig)const - { - RANGE_CHECK_RETURN_NULLPTR(vig) - - return vid_group->vid+size_t(vig); - } - - IndexBuffer * GetIndexBuffer ()const{return primitive->GetIndexBuffer();} - const uint32_t GetIndexBufferOffset()const{return primitive->GetIndexBufferOffset();} - const uint32_t GetDrawCount ()const{return primitive->GetDrawCount();} + const VertexInputData * GetVertexInputData ()const{return vertex_input;} MaterialParameters *GetMP (const DescriptorSetType &type){return mat_inst->GetMP(type);} diff --git a/src/SceneGraph/Vulkan/VKRenderable.cpp b/src/SceneGraph/Vulkan/VKRenderable.cpp index 910ceb00..188c4021 100644 --- a/src/SceneGraph/Vulkan/VKRenderable.cpp +++ b/src/SceneGraph/Vulkan/VKRenderable.cpp @@ -5,50 +5,38 @@ #include VK_NAMESPACE_BEGIN -VertexInputDataGroup::VertexInputDataGroup(const VIL *vd) +VertexInputData::VertexInputData(const uint32_t c,const uint32_t vc,const IndexBufferData *ibd) { - vil=vd; + binding_count=c; - uint first_binding=0; + buffer_list=new VkBuffer[binding_count]; + buffer_offset=new VkDeviceSize[binding_count]; - for(uint i=0;iGetCount(VertexInputGroup(i)); + vertex_count=vc; - if(vid[i].binding_count>0) - { - vid[i].first_binding=vil->GetFirstBinding(VertexInputGroup(i)); - - vid[i].buffer_list=new VkBuffer[vid[i].binding_count]; - vid[i].buffer_offset=new VkDeviceSize[vid[i].binding_count]; - } - } + index_buffer=ibd; } -VertexInputDataGroup::~VertexInputDataGroup() +VertexInputData::~VertexInputData() { - for(uint i=0;i0) - { - delete[] vid[i].buffer_list; - delete[] vid[i].buffer_offset; - } + delete[] buffer_list; + delete[] buffer_offset; } -Renderable::Renderable(Primitive *r,MaterialInstance *mi,Pipeline *p,VertexInputDataGroup *vidg) +Renderable::Renderable(Primitive *r,MaterialInstance *mi,Pipeline *p,VertexInputData *vi) { primitive=r; pipeline=p; mat_inst=mi; - vid_group=vidg; + vertex_input=vi; } Renderable::~Renderable() { //需要在这里添加删除pipeline/desc_sets/primitive引用计数的代码 - delete vid_group; + delete vertex_input; } Renderable *CreateRenderable(Primitive *prim,MaterialInstance *mi,Pipeline *p) @@ -56,7 +44,7 @@ Renderable *CreateRenderable(Primitive *prim,MaterialInstance *mi,Pipeline *p) if(!prim||!mi||!p)return(nullptr); const VIL *vil=mi->GetVIL(); - const uint input_count=vil->GetCount(VertexInputGroup::Basic); //不统计Bone/LocalToWorld组的 + const uint32_t input_count=vil->GetCount(VertexInputGroup::Basic); //不统计Bone/LocalToWorld组的 const UTF8String &mtl_name=mi->GetMaterial()->GetName(); if(prim->GetBufferCount()vid[size_t(VertexInputGroup::Basic)]; + VertexInputData *vid=new VertexInputData(input_count,prim->GetVertexCount(),prim->GetIndexBuffer()); const VertexInputFormat *vif=vil->GetFormatList(VertexInputGroup::Basic); for(uint i=0;iGetVBO(vif->name,vid.buffer_offset+i); + vbo=prim->GetVBO(vif->name,vid->buffer_offset+i); if(!vbo) { @@ -104,10 +90,10 @@ Renderable *CreateRenderable(Primitive *prim,MaterialInstance *mi,Pipeline *p) return(nullptr); } - vid.buffer_list[i]=vbo->GetBuffer(); + vid->buffer_list[i]=vbo->GetBuffer(); ++vif; } - return(new Renderable(prim,mi,p,vid_group)); + return(new Renderable(prim,mi,p,vid)); } VK_NAMESPACE_END