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

rename and layout codes.

Browse Source
This commit is contained in:
hyzboy
2024-05-27 01:42:10 +08:00
parent 8bb97ef2de
commit 742fe201ad
12 changed files with 115 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,6 @@
VK_NAMESPACE_BEGIN
class RenderAssignBuffer;
/**
* 同一材质的对象渲染列表
*/
@@ -24,13 +23,13 @@ private:
struct RenderItem
{
uint32_t first;
uint32_t count;
uint32_t first;
uint32_t count;
Pipeline * pipeline;
MaterialInstance * mi;
const VertexInputData * vid;
const DrawData * dd;
Pipeline * pipeline;
MaterialInstance * mi;
const PrimitiveRenderBuffer * prb;
const PrimitiveRenderData * prd;
public:
@@ -44,14 +43,13 @@ private:
protected:
VABList * vbo_list;
VABList * vbo_list;
Pipeline * last_pipeline;
const VertexInputData * last_vid;
const DrawData * last_dd;
uint last_index;
Pipeline * last_pipeline;
const PrimitiveRenderBuffer * last_render_buf;
const PrimitiveRenderData * last_render_data;
bool BindVAB(const VertexInputData *,const DrawData *,const uint);
bool BindVAB(const PrimitiveRenderBuffer *,const PrimitiveRenderData *,const uint);
void Render(RenderItem *);

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

@@ -54,8 +54,8 @@ class DeviceMemory;
class DeviceBuffer;
struct DeviceBufferData;
struct VertexInputData;
struct DrawData;
struct PrimitiveRenderBuffer;
struct PrimitiveRenderData;
class VertexAttribBuffer;
using VAB=VertexAttribBuffer;

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

@@ -209,7 +209,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 VertexInputData *vid,const DrawData *dd);
void Draw (const PrimitiveRenderBuffer *prb,const PrimitiveRenderData *prd);
// void DrawIndexed (const IBAccess *iba,const uint32_t instance_count);
public: //dynamic state

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

@@ -22,7 +22,7 @@ class Material
{
AnsiString name;
VertexInput *vertex_input_data;
VertexInput *primitive_render_buffer;
ShaderModuleMap *shader_maps;
@@ -51,7 +51,7 @@ public:
const AnsiString & GetName ()const{return name;}
const VertexInput * GetVertexInput ()const{return vertex_input_data;}
const VertexInput * GetVertexInput ()const{return primitive_render_buffer;}
const ShaderStageCreateInfoList & GetStageList ()const{return shader_stage_list;}

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

@@ -9,35 +9,35 @@
#include<hgl/graph/VKMaterialInstance.h>
#include<hgl/graph/VertexAttrib.h>
VK_NAMESPACE_BEGIN
struct VertexInputData
struct PrimitiveRenderBuffer
{
uint32_t vab_count;
VkBuffer *vab_list;
IndexBuffer *ibo;
uint32_t vab_count;
VkBuffer * vab_list;
IndexBuffer * ibo;
public:
VertexInputData(const uint32_t,const uint32_t,const IBAccess *iba);
~VertexInputData();
PrimitiveRenderBuffer(const uint32_t,const uint32_t,const IBAccess *iba);
~PrimitiveRenderBuffer();
const bool Comp(const VertexInputData *vid)const;
};//struct VertexInputData
const bool Comp(const PrimitiveRenderBuffer *prb)const;
};//struct PrimitiveRenderBuffer
struct DrawData
struct PrimitiveRenderData
{
uint vab_count;
VkDeviceSize * vab_offset;
VkDeviceSize vertex_count;
uint32_t vertex_count;
VkDeviceSize index_start;
VkDeviceSize index_count;
uint32_t index_start;
uint32_t index_count;
public:
DrawData(const uint32_t bc,const VkDeviceSize vc,const IBAccess *iba);
~DrawData();
PrimitiveRenderData(const uint32_t bc,const uint32_t vc,const IBAccess *iba);
~PrimitiveRenderData();
const bool Comp(const DrawData *)const;
const bool Comp(const PrimitiveRenderData *)const;
};
/**
@@ -49,14 +49,14 @@ class Renderable
MaterialInstance * mat_inst;
Primitive * primitive;
VertexInputData * vertex_input_data;
DrawData * draw_data;
PrimitiveRenderBuffer * primitive_render_buffer;
PrimitiveRenderData * primitive_render_data;
private:
friend Renderable *CreateRenderable(Primitive *,MaterialInstance *,Pipeline *);
Renderable(Primitive *,MaterialInstance *,Pipeline *,VertexInputData *,DrawData *);
Renderable(Primitive *,MaterialInstance *,Pipeline *,PrimitiveRenderBuffer *,PrimitiveRenderData *);
public:
@@ -64,8 +64,8 @@ public:
{
//需要在这里添加删除pipeline/desc_sets/primitive引用计数的代码
SAFE_CLEAR(vertex_input_data);
SAFE_CLEAR(draw_data);
SAFE_CLEAR(primitive_render_buffer);
SAFE_CLEAR(primitive_render_data);
}
void UpdatePipeline (Pipeline *p){pipeline=p;}
@@ -77,8 +77,8 @@ public:
Primitive * GetPrimitive (){return primitive;}
const AABB & GetBoundingBox ()const{return primitive->GetBoundingBox();}
const VertexInputData * GetVertexInputData ()const{return vertex_input_data;}
const DrawData * GetDrawData ()const{return draw_data;}
const PrimitiveRenderBuffer * GetRenderBuffer ()const{return primitive_render_buffer;}
const PrimitiveRenderData * GetRenderData ()const{return primitive_render_data;}
};//class Renderable
Renderable *CreateRenderable(Primitive *,MaterialInstance *,Pipeline *);