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

renamed to MeshDataBuffer from PrimitiveDataBuffer,

Browse Source 
renamed to MeshRenderData from PrimitiveRenderData
This commit is contained in:
hyzboy
2025-05-18 02:07:10 +08:00
parent 014fce2c8e
commit 4b2f344c5c
7 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
inc/hgl/graph/MaterialRenderList.h
View File

@@ -68,8 +68,8 @@ private:
MaterialInstance * mi;
const PrimitiveDataBuffer * pdb;
const PrimitiveRenderData * prd;
const MeshDataBuffer * pdb;
const MeshRenderData * prd;
public:
@@ -92,14 +92,14 @@ protected:
VABList * vab_list;
const PrimitiveDataBuffer * last_data_buffer;
const MeshDataBuffer * last_data_buffer;
const VDM * last_vdm;
const PrimitiveRenderData * last_render_data;
const MeshRenderData * last_render_data;
int first_indirect_draw_index=-1;
uint indirect_draw_count=0;
bool BindVAB(const PrimitiveDataBuffer *,const uint);
bool BindVAB(const MeshDataBuffer *,const uint);
void ProcIndirectRender();
void Render(RenderItem *);

4
inc/hgl/graph/VK.h
View File

@@ -73,8 +73,8 @@ class DeviceBuffer;
struct DeviceBufferData;
template<typename T> class DeviceBufferMap;
struct PrimitiveDataBuffer;
struct PrimitiveRenderData;
struct MeshDataBuffer;
struct MeshRenderData;
class VertexAttribBuffer;
using VAB=VertexAttribBuffer;

4
inc/hgl/graph/VKCommandBuffer.h
View File

@@ -202,7 +202,7 @@ public:
void BindIBO(IndexBuffer *,const VkDeviceSize byte_offset=0);
bool BindDataBuffer(const PrimitiveDataBuffer *);
bool BindDataBuffer(const MeshDataBuffer *);
void SetViewport (uint32_t first,uint32_t count,const VkViewport *vp) {vkCmdSetViewport(cmd_buf,first,count,vp);}
void SetScissor (uint32_t first,uint32_t count,const VkRect2D *sci) {vkCmdSetScissor(cmd_buf,first,count,sci);}
@@ -239,7 +239,7 @@ public: //draw
void DrawIndirect (VkBuffer buf, uint32_t drawCount,uint32_t stride=sizeof(VkDrawIndirectCommand )){return DrawIndirect( buf,0,drawCount,stride);}
void DrawIndexedIndirect(VkBuffer buf, uint32_t drawCount,uint32_t stride=sizeof(VkDrawIndexedIndirectCommand )){return DrawIndexedIndirect( buf,0,drawCount,stride);}
void Draw (const PrimitiveDataBuffer *prb,const PrimitiveRenderData *prd,const uint32_t instance_count=1,const uint32_t first_instance=0);
void Draw (const MeshDataBuffer *prb,const MeshRenderData *prd,const uint32_t instance_count=1,const uint32_t first_instance=0);
public: //dynamic state

28
inc/hgl/graph/VKRenderable.h
View File

@@ -12,7 +12,7 @@ VK_NAMESPACE_BEGIN
* 原始图元数据缓冲区<Br>
* 提供在渲染之前的数据绑定信息
*/
struct PrimitiveDataBuffer:public Comparator<PrimitiveDataBuffer>
struct MeshDataBuffer:public Comparator<MeshDataBuffer>
{
uint32_t vab_count;
VkBuffer * vab_list;
@@ -29,17 +29,17 @@ struct PrimitiveDataBuffer:public Comparator<PrimitiveDataBuffer>
public:
PrimitiveDataBuffer(const uint32_t,IndexBuffer *,VertexDataManager *_v=nullptr);
~PrimitiveDataBuffer();
MeshDataBuffer(const uint32_t,IndexBuffer *,VertexDataManager *_v=nullptr);
~MeshDataBuffer();
const int compare(const PrimitiveDataBuffer &pdb)const override;
};//struct PrimitiveDataBuffer
const int compare(const MeshDataBuffer &pdb)const override;
};//struct MeshDataBuffer
/**
* 原始图元渲染数据<Br>
* 提供在渲染时的数据
*/
struct PrimitiveRenderData:public ComparatorData<PrimitiveRenderData>
struct MeshRenderData:public ComparatorData<MeshRenderData>
{
//因为要VAB是流式访问，所以我们这个结构会被用做排序依据
//也因此，把vertex_offset放在最前面
@@ -52,7 +52,7 @@ struct PrimitiveRenderData:public ComparatorData<PrimitiveRenderData>
public:
PrimitiveRenderData(const uint32_t vc,const uint32_t ic,const int32_t vo=0,const uint32_t fi=0)
MeshRenderData(const uint32_t vc,const uint32_t ic,const int32_t vo=0,const uint32_t fi=0)
{
vertex_count =vc;
index_count =ic;
@@ -70,14 +70,14 @@ class Mesh
MaterialInstance * mat_inst;
Primitive * primitive;
PrimitiveDataBuffer * primitive_data_buffer;
PrimitiveRenderData * primitive_render_data;
MeshDataBuffer * data_buffer;
MeshRenderData * render_data;
private:
friend Mesh *CreateRenderable(Primitive *,MaterialInstance *,Pipeline *);
Mesh(Primitive *,MaterialInstance *,Pipeline *,PrimitiveDataBuffer *,PrimitiveRenderData *);
Mesh(Primitive *,MaterialInstance *,Pipeline *,MeshDataBuffer *,MeshRenderData *);
public:
@@ -85,8 +85,8 @@ public:
{
//需要在这里添加删除pipeline/desc_sets/primitive引用计数的代码
SAFE_CLEAR(primitive_data_buffer);
SAFE_CLEAR(primitive_render_data);
SAFE_CLEAR(data_buffer);
SAFE_CLEAR(render_data);
}
void UpdatePipeline (Pipeline *p){pipeline=p;}
@@ -98,8 +98,8 @@ public:
Primitive * GetPrimitive (){return primitive;}
const AABB & GetBoundingBox ()const{return primitive->GetBoundingBox();}
const PrimitiveDataBuffer *GetDataBuffer ()const{return primitive_data_buffer;}
const PrimitiveRenderData *GetRenderData ()const{return primitive_render_data;}
const MeshDataBuffer * GetDataBuffer ()const{return data_buffer;}
const MeshRenderData * GetRenderData ()const{return render_data;}
public: