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

VertexBufferBase rename to VertexAttribDataAccess

Browse Source
This commit is contained in:
hyzboy 2020-07-16 20:36:54 +08:00
parent 770ab4d1d9
commit 2199b000fa
11 changed files with 184 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMSceneGraph

@ -1 +1 @@
Subproject commit 3acc9851166e41f2560b968791f43477ab524cc7 Subproject commit 763c27844434485445099281bac163833934c4d3

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

@ -2,7 +2,7 @@
#define HGL_GRAPH_RENDERABLE_CREATER_INCLUDE #define HGL_GRAPH_RENDERABLE_CREATER_INCLUDE
#include<hgl/graph/SceneDB.h> #include<hgl/graph/SceneDB.h>
#include<hgl/graph/VertexAttribBuffer.h> #include<hgl/graph/VertexAttribDataAccess.h>
namespace hgl namespace hgl
{ {
namespace graph namespace graph
@ -70,7 +70,7 @@ namespace hgl
virtual bool Init(const uint32 count); ///<初始化，参数为顶点数量 virtual bool Init(const uint32 count); ///<初始化，参数为顶点数量
virtual VAD * CreateVAB(const AnsiString &name); ///<创建一个顶点属性缓冲区创建器 virtual VAD * CreateVAD(const AnsiString &name); ///<创建一个顶点属性缓冲区创建器
uint16 * CreateIBO16(uint count,const uint16 *data=nullptr); ///<创建16位的索引缓冲区 uint16 * CreateIBO16(uint count,const uint16 *data=nullptr); ///<创建16位的索引缓冲区
uint32 * CreateIBO32(uint count,const uint32 *data=nullptr); ///<创建32位的索引缓冲区 uint32 * CreateIBO32(uint count,const uint32 *data=nullptr); ///<创建32位的索引缓冲区

14
inc/hgl/graph/VertexAttribData.h
View File

@ -9,7 +9,7 @@ namespace hgl
/** /**
* 顶点属性数据 * 顶点属性数据
*/ */
class VertexAttribData ///顶点属性缓冲区创建者 class VertexAttribData ///顶点属性数据
{ {
void *mem_data; ///<内存中的数据 void *mem_data; ///<内存中的数据
@ -22,11 +22,13 @@ namespace hgl
const uint32_t stride; ///<每组数据字节数 const uint32_t stride; ///<每组数据字节数
const uint32_t total_bytes; ///<字节数 const uint32_t total_bytes; ///<字节数
VkFormat vk_format; ///<在Vulkan中的数据类型
void *mem_end; ///<内存数据区访问结束地址 void *mem_end; ///<内存数据区访问结束地址
public: public:
VertexAttribData(uint32_t c,uint32_t dc,uint32_t cs):count(c),dc_num(dc),comp_stride(cs),stride(dc*cs),total_bytes(dc*cs*c) VertexAttribData(uint32_t c,uint32_t dc,uint32_t cs,VkFormat fmt):count(c),dc_num(dc),comp_stride(cs),stride(dc*cs),total_bytes(dc*cs*c),vk_format(fmt)
{ {
mem_data = hgl_malloc(total_bytes); //在很多情况下，hgl_malloc分配的内存是对齐的，这样有效率上的提升 mem_data = hgl_malloc(total_bytes); //在很多情况下，hgl_malloc分配的内存是对齐的，这样有效率上的提升
mem_end = ((char *)mem_data) + total_bytes; mem_end = ((char *)mem_data) + total_bytes;
@ -38,13 +40,13 @@ namespace hgl
hgl_free(mem_data); hgl_free(mem_data);
} }
virtual VkFormat GetDataType ()const=0; ///<取得数据类型 const VkFormat GetVulkanFormat ()const{return vk_format;} ///<取得数据类型
const uint32_t GetDataBytes ()const{return comp_stride;} ///<取得每数据字节数 const uint32_t GetDataBytes ()const{return comp_stride;} ///<取得每数据字节数
const uint32_t GetComponent ()const{return dc_num; } ///<取数缓冲区元数据数量 const uint32_t GetComponent ()const{return dc_num;} ///<取数缓冲区元数据数量
const uint32_t GetCount ()const{return count; } ///<取得数据数量 const uint32_t GetCount ()const{return count;} ///<取得数据数量
const uint32_t GetStride ()const{return stride;} ///<取得每一组数据字节数 const uint32_t GetStride ()const{return stride;} ///<取得每一组数据字节数
void * GetData ()const{return mem_data;} ///<取得数据指针 void * GetData ()const{return mem_data;} ///<取得数据指针
const uint32_t GetTotalBytes ()const{return total_bytes; } ///<取得数据字节数 const uint32_t GetTotalBytes ()const{return total_bytes;} ///<取得数据字节数
};//class VertexAttribData };//class VertexAttribData
using VAD=VertexAttribData; using VAD=VertexAttribData;

240
inc/hgl/graph/VertexAttribBuffer.h → inc/hgl/graph/VertexAttribDataAccess.h
View File

@ -1,5 +1,5 @@
#ifndef HGL_GRAPH_VERTEX_ATTRIB_BUFFER_INCLUDE #ifndef HGL_GRAPH_VERTEX_ATTRIB_DATA_ACCESS_INCLUDE
#define HGL_GRAPH_VERTEX_ATTRIB_BUFFER_INCLUDE #define HGL_GRAPH_VERTEX_ATTRIB_DATA_ACCESS_INCLUDE
#include<hgl/type/Color3f.h> #include<hgl/type/Color3f.h>
#include<hgl/type/Color4f.h> #include<hgl/type/Color4f.h>
@ -12,9 +12,9 @@ namespace hgl
namespace graph namespace graph
{ {
/** /**
* 顶点属性数据实际模板 * 顶点属性数据访问模板
*/ */
template<typename T,int C> class VertexAttribBufferBase:public VertexAttribData template<typename T,int C> class VertexAttribDataAccess
{ {
protected: protected:
@ -25,7 +25,7 @@ namespace hgl
public: public:
VertexAttribBufferBase(uint32_t _size,const T *_data=nullptr):VertexAttribData(_size,C,sizeof(T)) VertexAttribDataAccess(uint32_t _size,const T *_data=nullptr)
{ {
mem_type=(T *)GetData(); mem_type=(T *)GetData();
access=0; access=0;
@ -35,7 +35,7 @@ namespace hgl
memcpy(mem_type,_data,total_bytes); memcpy(mem_type,_data,total_bytes);
} }
virtual ~VertexAttribBufferBase()=default; virtual ~VertexAttribDataAccess()=default;
void BufferData(const T *ptr) void BufferData(const T *ptr)
{ {
@ -114,14 +114,25 @@ namespace hgl
/** /**
* 一元数据缓冲区 * 一元数据缓冲区
*/ */
template<typename T> class VertexBuffer1:public VertexAttribBufferBase<T,1> template<typename T,VkFormat VKFMT> class VertexAttribDataAccess1:public VertexAttribDataAccess<T,1>
{ {
public: public:
using VertexAttribBufferBase<T,1>::VertexAttribBufferBase; using VertexAttribDataAccess<T,1>::VertexAttribDataAccess;
virtual ~VertexBuffer1()=default; virtual ~VertexAttribDataAccess1()=default;
VkFormat GetDataType()const override; static VertexAttribDataAccess1<T,VKFMT> * Create(VertexAttribData *vad)
{
if(!vad)return(nullptr);
if(vad->GetComponent()!=1)
return(nullptr);
if(vad->GetDataType()!=VKFMT)
return(nullptr);
return(new VertexAttribDataAccess1<T,VKFMT>(vad->GetCount(),vad->GetData()));
}
/** /**
* 计算绑定盒 * 计算绑定盒
@ -167,7 +178,7 @@ namespace hgl
{ {
if(!this->access||this->access+1>this->mem_end) if(!this->access||this->access+1>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer1::Write(const T) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess1::Write(const T) out"));
return(false); return(false);
} }
@ -184,7 +195,7 @@ namespace hgl
{ {
if(!this->access||this->access+count>this->mem_end) if(!this->access||this->access+count>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer1::Write(const T,")+OSString::valueOf(count)+OS_TEXT(") out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess1::Write(const T,")+OSString::valueOf(count)+OS_TEXT(") out"));
return(false); return(false);
} }
@ -192,19 +203,30 @@ namespace hgl
this->access+=count; this->access+=count;
return(true); return(true);
} }
};//class VertexBuffer1 };//class VertexAttribDataAccess1
/** /**
* 二元数据缓冲区 * 二元数据缓冲区
*/ */
template<typename T> class VertexBuffer2:public VertexAttribBufferBase<T,2> template<typename T,VkFormat VKFMT> class VertexAttribDataAccess2:public VertexAttribDataAccess<T,2>
{ {
public: public:
using VertexAttribBufferBase<T,2>::VertexAttribBufferBase; using VertexAttribDataAccess<T,2>::VertexAttribDataAccess;
virtual ~VertexBuffer2()=default; virtual ~VertexAttribDataAccess2()=default;
VkFormat GetDataType()const override; static VertexAttribDataAccess2<T,VKFMT> * Create(VertexAttribData *vad)
{
if(!vad)return(nullptr);
if(vad->GetComponent()!=2)
return(nullptr);
if(vad->GetDataType()!=VKFMT)
return(nullptr);
return(new VertexAttribDataAccess2<T,VKFMT>(vad->GetCount(),vad->GetData()));
}
/** /**
* 计算绑定盒 * 计算绑定盒
@ -252,7 +274,7 @@ namespace hgl
{ {
if(!this->access||this->access+2>this->mem_end) if(!this->access||this->access+2>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer2::Write(const T ,const T) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess2::Write(const T ,const T) out"));
return(false); return(false);
} }
@ -266,7 +288,7 @@ namespace hgl
{ {
if(!this->access||this->access+2>this->mem_end) if(!this->access||this->access+2>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer2::Write(T *) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess2::Write(T *) out"));
return(false); return(false);
} }
@ -281,7 +303,7 @@ namespace hgl
{ {
if(!this->access||this->access+2>this->mem_end) if(!this->access||this->access+2>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer2::Write(vec2 &) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess2::Write(vec2 &) out"));
return(false); return(false);
} }
@ -301,7 +323,7 @@ namespace hgl
{ {
if(!this->access||this->access+(count<<1)>this->mem_end) if(!this->access||this->access+(count<<1)>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer1::Write(const Vector2f &,")+OSString::valueOf(count)+OS_TEXT(") out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess1::Write(const Vector2f &,")+OSString::valueOf(count)+OS_TEXT(") out"));
return(false); return(false);
} }
@ -318,7 +340,7 @@ namespace hgl
{ {
if(!this->access||this->access+4>this->mem_end) if(!this->access||this->access+4>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer2::WriteLine(T,T,T,T) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess2::WriteLine(T,T,T,T) out"));
return(false); return(false);
} }
@ -335,7 +357,7 @@ namespace hgl
{ {
if(!this->access||this->access+4>this->mem_end) if(!this->access||this->access+4>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer2::WriteLine(vec2,vec2) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess2::WriteLine(vec2,vec2) out"));
return(false); return(false);
} }
@ -355,7 +377,7 @@ namespace hgl
{ {
if(!this->access||this->access+6>this->mem_end) if(!this->access||this->access+6>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer2::WriteTriangle(vec2,vec2,vec2) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess2::WriteTriangle(vec2,vec2,vec2) out"));
return(false); return(false);
} }
@ -379,7 +401,7 @@ namespace hgl
{ {
if(!this->access||this->access+6>this->mem_end) if(!this->access||this->access+6>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer2::WriteTriangle(vec2 *) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess2::WriteTriangle(vec2 *) out"));
return(false); return(false);
} }
@ -407,7 +429,7 @@ namespace hgl
if(WriteTriangle(lt,rb,rt)) if(WriteTriangle(lt,rb,rt))
return(true); return(true);
LOG_HINT(OS_TEXT("VertexBuffer2::WriteQuad(vec2 &,vec2 &,vec2 &,vec2 &) error")); LOG_HINT(OS_TEXT("VertexAttribDataAccess2::WriteQuad(vec2 &,vec2 &,vec2 &,vec2 &) error"));
return(false); return(false);
} }
@ -439,7 +461,7 @@ namespace hgl
{ {
if(!this->access||this->access+8>this->mem_end) if(!this->access||this->access+8>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer2::WriteRectFan(RectScope2 *) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess2::WriteRectFan(RectScope2 *) out"));
return(false); return(false);
} }
@ -463,7 +485,7 @@ namespace hgl
{ {
if(!this->access||this->access+8>this->mem_end) if(!this->access||this->access+8>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer2::WriteRectTriangleStrip(RectScope2 *) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess2::WriteRectTriangleStrip(RectScope2 *) out"));
return(false); return(false);
} }
@ -481,19 +503,30 @@ namespace hgl
return(true); return(true);
} }
};//class VertexBuffer2 };//class VertexAttribDataAccess2
/** /**
* 三元数据缓冲区 * 三元数据缓冲区
*/ */
template<typename T> class VertexBuffer3:public VertexAttribBufferBase<T,3> template<typename T,VkFormat VKFMT> class VertexAttribDataAccess3:public VertexAttribDataAccess<T,3>
{ {
public: public:
using VertexAttribBufferBase<T,3>::VertexAttribBufferBase; using VertexAttribDataAccess<T,3>::VertexAttribDataAccess;
virtual ~VertexBuffer3()=default; virtual ~VertexAttribDataAccess3()=default;
VkFormat GetDataType()const override; static VertexAttribDataAccess3<T,VKFMT> * Create(VertexAttribData *vad)
{
if(!vad)return(nullptr);
if(vad->GetComponent()!=3)
return(nullptr);
if(vad->GetDataType()!=VMFKT)
return(nullptr);
return(new VertexAttribDataAccess3<T,VKFMT>(vad->GetCount(),vad->GetData()));
}
/** /**
* 计算绑定盒 * 计算绑定盒
@ -544,7 +577,7 @@ namespace hgl
{ {
if(!this->access||this->access+3>this->mem_end) if(!this->access||this->access+3>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer3::Write(T,T,T) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess3::Write(T,T,T) out"));
return(false); return(false);
} }
@ -559,7 +592,7 @@ namespace hgl
{ {
if(!this->access||this->access+3>this->mem_end) if(!this->access||this->access+3>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer3::Write(T *) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess3::Write(T *) out"));
return(false); return(false);
} }
@ -575,7 +608,7 @@ namespace hgl
{ {
if(!this->access||this->access+3>this->mem_end) if(!this->access||this->access+3>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer3::Write(vec3 &) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess3::Write(vec3 &) out"));
return(false); return(false);
} }
@ -596,7 +629,7 @@ namespace hgl
{ {
if(!this->access||this->access+(count*3)>this->mem_end) if(!this->access||this->access+(count*3)>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer3::Write(const Vector3f,")+OSString::valueOf(count)+OS_TEXT(") out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess3::Write(const Vector3f,")+OSString::valueOf(count)+OS_TEXT(") out"));
return(false); return(false);
} }
@ -620,7 +653,7 @@ namespace hgl
{ {
if(!this->access||this->access+(count*3)>this->mem_end) if(!this->access||this->access+(count*3)>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer3::Write(const Vector3f,")+OSString::valueOf(count)+OS_TEXT(") out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess3::Write(const Vector3f,")+OSString::valueOf(count)+OS_TEXT(") out"));
return(false); return(false);
} }
@ -640,7 +673,7 @@ namespace hgl
{ {
if(!this->access||this->access+3>this->mem_end) if(!this->access||this->access+3>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer3::Write(color3f &) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess3::Write(color3f &) out"));
return(false); return(false);
} }
@ -655,7 +688,7 @@ namespace hgl
{ {
if(!this->access||this->access+6>this->mem_end) if(!this->access||this->access+6>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer3::WriteLine(T,T,T,T,T,T) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess3::WriteLine(T,T,T,T,T,T) out"));
return(false); return(false);
} }
@ -674,7 +707,7 @@ namespace hgl
{ {
if(!this->access||this->access+6>this->mem_end) if(!this->access||this->access+6>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer3::WriteLine(vec3,vec3) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess3::WriteLine(vec3,vec3) out"));
return(false); return(false);
} }
@ -696,7 +729,7 @@ namespace hgl
{ {
if(!this->access||this->access+9>this->mem_end) if(!this->access||this->access+9>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer3::WriteTriangle(vec3,vec3,vec3) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess3::WriteTriangle(vec3,vec3,vec3) out"));
return(false); return(false);
} }
@ -723,7 +756,7 @@ namespace hgl
{ {
if(!this->access||this->access+9>this->mem_end) if(!this->access||this->access+9>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer3::WriteTriangle(vec3 *) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess3::WriteTriangle(vec3 *) out"));
return(false); return(false);
} }
@ -743,19 +776,30 @@ namespace hgl
return(true); return(true);
} }
};//class VertexBuffer3 };//class VertexAttribDataAccess3
/** /**
* 四元数据缓冲区 * 四元数据缓冲区
*/ */
template<typename T> class VertexBuffer4:public VertexAttribBufferBase<T,4> template<typename T,VkFormat VKFMT> class VertexAttribDataAccess4:public VertexAttribDataAccess<T,4>
{ {
public: public:
using VertexAttribBufferBase<T,4>::VertexAttribBufferBase; using VertexAttribDataAccess<T,4>::VertexAttribDataAccess;
virtual ~VertexBuffer4()=default; virtual ~VertexAttribDataAccess4()=default;
VkFormat GetDataType()const override; static VertexAttribDataAccess4<T,VKFMT> * Create(VertexAttribData *vad)
{
if(!vad)return(nullptr);
if(vad->GetComponent()!=4)
return(nullptr);
if(vad->GetDataType()!=VMFMT)
return(nullptr);
return(new VertexAttribDataAccess4<T,VKFMT>(vad->GetCount(),vad->GetData()));
}
/** /**
* 计算绑定盒 * 计算绑定盒
@ -809,7 +853,7 @@ namespace hgl
{ {
if(!this->access||this->access+4>this->mem_end) if(!this->access||this->access+4>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer4::Write(T,T,T,T) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(T,T,T,T) out"));
return(false); return(false);
} }
@ -825,7 +869,7 @@ namespace hgl
{ {
if(!this->access||this->access+4>this->mem_end) if(!this->access||this->access+4>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer4::Write(T *) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(T *) out"));
return(false); return(false);
} }
@ -842,7 +886,7 @@ namespace hgl
{ {
if(!this->access||this->access+4>this->mem_end) if(!this->access||this->access+4>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer4::Write(color4 &) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(color4 &) out"));
return(false); return(false);
} }
@ -858,7 +902,7 @@ namespace hgl
{ {
if(!this->access||this->access+4>this->mem_end) if(!this->access||this->access+4>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer4::Write(color4 &) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(color4 &) out"));
return(false); return(false);
} }
@ -876,7 +920,7 @@ namespace hgl
if(!this->access||this->access+(4*count)>this->mem_end) if(!this->access||this->access+(4*count)>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer4::Write(color4 &,count) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(color4 &,count) out"));
return(false); return(false);
} }
@ -901,7 +945,7 @@ namespace hgl
{ {
if(!this->access||this->access+(count<<2)>this->mem_end) if(!this->access||this->access+(count<<2)>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer4::Write(const Vector4f,")+OSString::valueOf(count)+OS_TEXT(") out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(const Vector4f,")+OSString::valueOf(count)+OS_TEXT(") out"));
return(false); return(false);
} }
@ -926,7 +970,7 @@ namespace hgl
{ {
if(!this->access||this->access+(count<<2)>this->mem_end) if(!this->access||this->access+(count<<2)>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer4::Write(const Vector4f,")+OSString::valueOf(count)+OS_TEXT(") out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess4::Write(const Vector4f,")+OSString::valueOf(count)+OS_TEXT(") out"));
return(false); return(false);
} }
@ -947,7 +991,7 @@ namespace hgl
{ {
if(!this->access||this->access+8>this->mem_end) if(!this->access||this->access+8>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer4::WriteLine(T,T,T,T,T,T) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess4::WriteLine(T,T,T,T,T,T) out"));
return(false); return(false);
} }
@ -968,7 +1012,7 @@ namespace hgl
{ {
if(!this->access||this->access+8>this->mem_end) if(!this->access||this->access+8>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer4::WriteLine(vec3,vec3) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess4::WriteLine(vec3,vec3) out"));
return(false); return(false);
} }
@ -992,7 +1036,7 @@ namespace hgl
{ {
if(!this->access||this->access+12>this->mem_end) if(!this->access||this->access+12>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer4::WriteTriangle(vec3,vec3,vec3) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess4::WriteTriangle(vec3,vec3,vec3) out"));
return(false); return(false);
} }
@ -1022,7 +1066,7 @@ namespace hgl
{ {
if(!this->access||this->access+12>this->mem_end) if(!this->access||this->access+12>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer4::WriteTriangle(vec3 *) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess4::WriteTriangle(vec3 *) out"));
return(false); return(false);
} }
@ -1054,7 +1098,7 @@ namespace hgl
{ {
if(!this->access||this->access+4>this->mem_end) if(!this->access||this->access+4>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer4::WriteRectangle2D(RectScope2 ) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess4::WriteRectangle2D(RectScope2 ) out"));
return(false); return(false);
} }
@ -1074,7 +1118,7 @@ namespace hgl
{ {
if(!this->access||this->access+(4*count)>this->mem_end) if(!this->access||this->access+(4*count)>this->mem_end)
{ {
LOG_HINT(OS_TEXT("VertexBuffer4::WriteRectangle2D(RectScope2 *,count) out")); LOG_HINT(OS_TEXT("VertexAttribDataAccess4::WriteRectangle2D(RectScope2 *,count) out"));
return(false); return(false);
} }
@ -1090,52 +1134,54 @@ namespace hgl
return(true); return(true);
} }
};//class VertexBuffer4 };//class VertexAttribDataAccess4
//缓冲区具体数据类型定义 //缓冲区具体数据类型定义
typedef VertexBuffer1<int8 > VB1i8 ,VB1b; template<> inline VkFormat VertexBuffer1<int8 >::GetDataType()const{return FMT_R8I; } typedef VertexAttribDataAccess1<int8 ,FMT_R8I > VB1i8 ,VB1b;
typedef VertexBuffer1<int16 > VB1i16 ,VB1s; template<> inline VkFormat VertexBuffer1<int16 >::GetDataType()const{return FMT_R16I; } typedef VertexAttribDataAccess1<int16 ,FMT_R16I > VB1i16 ,VB1s;
typedef VertexBuffer1<int32 > VB1i32 ,VB1i; template<> inline VkFormat VertexBuffer1<int32 >::GetDataType()const{return FMT_R32I; } typedef VertexAttribDataAccess1<int32 ,FMT_R32I > VB1i32 ,VB1i;
typedef VertexBuffer1<uint8 > VB1u8 ,VB1ub; template<> inline VkFormat VertexBuffer1<uint8 >::GetDataType()const{return FMT_R8U; } typedef VertexAttribDataAccess1<uint8 ,FMT_R8U > VB1u8 ,VB1ub;
typedef VertexBuffer1<uint16> VB1u16 ,VB1us; template<> inline VkFormat VertexBuffer1<uint16 >::GetDataType()const{return FMT_R16U; } typedef VertexAttribDataAccess1<uint16,FMT_R16U > VB1u16 ,VB1us;
typedef VertexBuffer1<uint32> VB1u32 ,VB1ui; template<> inline VkFormat VertexBuffer1<uint32 >::GetDataType()const{return FMT_R32U; } typedef VertexAttribDataAccess1<uint32,FMT_R32U > VB1u32 ,VB1ui;
typedef VertexBuffer1<float > VB1f; template<> inline VkFormat VertexBuffer1<float >::GetDataType()const{return FMT_R32F; } typedef VertexAttribDataAccess1<float ,FMT_R32F > VB1f;
typedef VertexBuffer1<double> VB1d; template<> inline VkFormat VertexBuffer1<double >::GetDataType()const{return FMT_R64F; } typedef VertexAttribDataAccess1<double,FMT_R64F > VB1d;
typedef VertexBuffer2<int8 > VB2i8 ,VB2b; template<> inline VkFormat VertexBuffer2<int8 >::GetDataType()const{return FMT_RG8I; } typedef VertexAttribDataAccess2<int8 ,FMT_RG8I > VB2i8 ,VB2b;
typedef VertexBuffer2<int16 > VB2i16 ,VB2s; template<> inline VkFormat VertexBuffer2<int16 >::GetDataType()const{return FMT_RG16I; } typedef VertexAttribDataAccess2<int16 ,FMT_RG16I > VB2i16 ,VB2s;
typedef VertexBuffer2<int32 > VB2i32 ,VB2i; template<> inline VkFormat VertexBuffer2<int32 >::GetDataType()const{return FMT_RG32I; } typedef VertexAttribDataAccess2<int32 ,FMT_RG32I > VB2i32 ,VB2i;
typedef VertexBuffer2<uint8 > VB2u8 ,VB2ub; template<> inline VkFormat VertexBuffer2<uint8 >::GetDataType()const{return FMT_RG8U; } typedef VertexAttribDataAccess2<uint8 ,FMT_RG8U > VB2u8 ,VB2ub;
typedef VertexBuffer2<uint16> VB2u16 ,VB2us; template<> inline VkFormat VertexBuffer2<uint16 >::GetDataType()const{return FMT_RG16U; } typedef VertexAttribDataAccess2<uint16,FMT_RG16U > VB2u16 ,VB2us;
typedef VertexBuffer2<uint32> VB2u32 ,VB2ui; template<> inline VkFormat VertexBuffer2<uint32 >::GetDataType()const{return FMT_RG32U; } typedef VertexAttribDataAccess2<uint32,FMT_RG32U > VB2u32 ,VB2ui;
typedef VertexBuffer2<float > VB2f; template<> inline VkFormat VertexBuffer2<float >::GetDataType()const{return FMT_RG32F; } typedef VertexAttribDataAccess2<float ,FMT_RG32F > VB2f;
typedef VertexBuffer2<double> VB2d; template<> inline VkFormat VertexBuffer2<double >::GetDataType()const{return FMT_RG64F; } typedef VertexAttribDataAccess2<double,FMT_RG64F > VB2d;
// typedef VertexBuffer3<int8 > VB3i8 ,VB3b; template<> inline VkFormat VertexBuffer3<int8 >::GetDataType()const{return FMT_RGB8I; } // typedef VertexAttribDataAccess3<int8 ,FMT_RGB8I > VB3i8 ,VB3b;
// typedef VertexBuffer3<int16 > VB3i16 ,VB3s; template<> inline VkFormat VertexBuffer3<int16 >::GetDataType()const{return FMT_RGB16I; } // typedef VertexAttribDataAccess3<int16 ,FMT_RGB16I > VB3i16 ,VB3s;
typedef VertexBuffer3<int32 > VB3i32 ,VB3i; template<> inline VkFormat VertexBuffer3<int32 >::GetDataType()const{return FMT_RGB32I; } typedef VertexAttribDataAccess3<int32 ,FMT_RGB32I > VB3i32 ,VB3i;
// typedef VertexBuffer3<uint8 > VB3u8 ,VB3ub; template<> inline VkFormat VertexBuffer3<uint8 >::GetDataType()const{return FMT_RGB8U; } // typedef VertexAttribDataAccess3<uint8 ,FMT_RGB8U > VB3u8 ,VB3ub;
// typedef VertexBuffer3<uint16> VB3u16 ,VB3us; template<> inline VkFormat VertexBuffer3<uint16 >::GetDataType()const{return FMT_RGB16U; } // typedef VertexAttribDataAccess3<uint16,FMT_RGB16U > VB3u16 ,VB3us;
typedef VertexBuffer3<uint32> VB3u32 ,VB3ui; template<> inline VkFormat VertexBuffer3<uint32 >::GetDataType()const{return FMT_RGB32U; } typedef VertexAttribDataAccess3<uint32,FMT_RGB32U > VB3u32 ,VB3ui;
typedef VertexBuffer3<float > VB3f; template<> inline VkFormat VertexBuffer3<float >::GetDataType()const{return FMT_RGB32F; } typedef VertexAttribDataAccess3<float ,FMT_RGB32F > VB3f;
typedef VertexBuffer3<double> VB3d; template<> inline VkFormat VertexBuffer3<double >::GetDataType()const{return FMT_RGB64F; } typedef VertexAttribDataAccess3<double,FMT_RGB64F > VB3d;
typedef VertexBuffer4<int8 > VB4i8 ,VB4b; template<> inline VkFormat VertexBuffer4<int8 >::GetDataType()const{return FMT_RGBA8I; } typedef VertexAttribDataAccess4<int8 ,FMT_RGBA8I > VB4i8 ,VB4b;
typedef VertexBuffer4<int16 > VB4i16 ,VB4s; template<> inline VkFormat VertexBuffer4<int16 >::GetDataType()const{return FMT_RGBA16I; } typedef VertexAttribDataAccess4<int16 ,FMT_RGBA16I> VB4i16 ,VB4s;
typedef VertexBuffer4<int32 > VB4i32 ,VB4i; template<> inline VkFormat VertexBuffer4<int32 >::GetDataType()const{return FMT_RGBA32I; } typedef VertexAttribDataAccess4<int32 ,FMT_RGBA32I> VB4i32 ,VB4i;
typedef VertexBuffer4<uint8 > VB4u8 ,VB4ub; template<> inline VkFormat VertexBuffer4<uint8 >::GetDataType()const{return FMT_RGBA8U; } typedef VertexAttribDataAccess4<uint8 ,FMT_RGBA8U > VB4u8 ,VB4ub;
typedef VertexBuffer4<uint16> VB4u16 ,VB4us; template<> inline VkFormat VertexBuffer4<uint16 >::GetDataType()const{return FMT_RGBA16U; } typedef VertexAttribDataAccess4<uint16,FMT_RGBA16U> VB4u16 ,VB4us;
typedef VertexBuffer4<uint32> VB4u32 ,VB4ui; template<> inline VkFormat VertexBuffer4<uint32 >::GetDataType()const{return FMT_RGBA32U; } typedef VertexAttribDataAccess4<uint32,FMT_RGBA32U> VB4u32 ,VB4ui;
typedef VertexBuffer4<float > VB4f; template<> inline VkFormat VertexBuffer4<float >::GetDataType()const{return FMT_RGBA32F; } typedef VertexAttribDataAccess4<float ,FMT_RGBA32F> VB4f;
typedef VertexBuffer4<double> VB4d; template<> inline VkFormat VertexBuffer4<double >::GetDataType()const{return FMT_RGBA64F; } typedef VertexAttribDataAccess4<double,FMT_RGBA64F> VB4d;
/** /**
* 根据格式要求，创建对应的VBC * 根据格式要求，创建对应的顶点属性数据区(VAD)
* @param base_type 基础格式,参见spirv_cross/spirv_common.hpp中的spirv_cross::SPIRType * @param base_type 基础格式,参见spirv_cross/spirv_common.hpp中的spirv_cross::SPIRType
* @param vecsize vec数量 * @param vecsize vec数量
* @param vertex_count 顶点数量 * @param vertex_count 顶点数量
*/ */
VertexAttribData *CreateVABCreater(const uint32_t base_type,const uint32_t vecsize,const uint32_t vertex_count); VertexAttribData *CreateVertexAttribData(const uint32_t base_type,const uint32_t vecsize,const uint32_t vertex_count);
}//namespace graph }//namespace graph
}//namespace hgl }//namespace hgl
#endif//HGL_GRAPH_VERTEX_ATTRIB_BUFFER_INCLUDE #endif//HGL_GRAPH_VERTEX_ATTRIB_DATA_ACCESS_INCLUDE

79
src/RenderDevice/Vulkan/VKBuffer.cpp
View File

@ -1,6 +1,4 @@
#include<hgl/graph/vulkan/VKBuffer.h> #include<hgl/graph/vulkan/VKBuffer.h>
#include<hgl/graph/VertexAttribBuffer.h>
#include<spirv_cross/spirv_common.hpp>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
Buffer::~Buffer() Buffer::~Buffer()
@ -8,81 +6,4 @@ Buffer::~Buffer()
if(buf.memory)delete buf.memory; if(buf.memory)delete buf.memory;
vkDestroyBuffer(device,buf.buffer,nullptr); vkDestroyBuffer(device,buf.buffer,nullptr);
} }
VertexAttribData *CreateVABCreater(const uint32_t base_type,const uint32_t vecsize,const uint32_t vertex_count)
{
if(base_type==spirv_cross::SPIRType::SByte)
{
if(vecsize==1)return(new VB1i8(vertex_count));else
if(vecsize==2)return(new VB2i8(vertex_count));else
//if(vecsize==3)return(new VB3i8(vertex_count));else
if(vecsize==4)return(new VB4i8(vertex_count));
}
else
if(base_type==spirv_cross::SPIRType::UByte)
{
if(vecsize==1)return(new VB1u8(vertex_count));else
if(vecsize==2)return(new VB2u8(vertex_count));else
//if(vecsize==3)return(new VB3u8(vertex_count));else
if(vecsize==4)return(new VB4u8(vertex_count));
}
else
if(base_type==spirv_cross::SPIRType::Short)
{
if(vecsize==1)return(new VB1i16(vertex_count));else
if(vecsize==2)return(new VB2i16(vertex_count));else
//if(vecsize==3)return(new VB3i16(vertex_count));else
if(vecsize==4)return(new VB4i16(vertex_count));
}
else
if(base_type==spirv_cross::SPIRType::UShort)
{
if(vecsize==1)return(new VB1u16(vertex_count));else
if(vecsize==2)return(new VB2u16(vertex_count));else
//if(vecsize==3)return(new VB3u16(vertex_count));else
if(vecsize==4)return(new VB4u16(vertex_count));
}
else
if(base_type==spirv_cross::SPIRType::Int)
{
if(vecsize==1)return(new VB1i32(vertex_count));else
if(vecsize==2)return(new VB2i32(vertex_count));else
if(vecsize==3)return(new VB3i32(vertex_count));else
if(vecsize==4)return(new VB4i32(vertex_count));
}
else
if(base_type==spirv_cross::SPIRType::UInt)
{
if(vecsize==1)return(new VB1u32(vertex_count));else
if(vecsize==2)return(new VB2u32(vertex_count));else
if(vecsize==3)return(new VB3u32(vertex_count));else
if(vecsize==4)return(new VB4u32(vertex_count));
}
else
if(base_type==spirv_cross::SPIRType::Half)
{
//if(vecsize==1)return(new VB1hf(vertex_count));else
//if(vecsize==2)return(new VB2hf(vertex_count));else
//if(vecsize==3)return(new VB3hf(vertex_count));else
//if(vecsize==4)return(new VB4hf(vertex_count));
}
else
if(base_type==spirv_cross::SPIRType::Float)
{
if(vecsize==1)return(new VB1f(vertex_count));else
if(vecsize==2)return(new VB2f(vertex_count));else
if(vecsize==3)return(new VB3f(vertex_count));else
if(vecsize==4)return(new VB4f(vertex_count));
}
else
if(base_type==spirv_cross::SPIRType::Double)
{
if(vecsize==1)return(new VB1d(vertex_count));else
if(vecsize==2)return(new VB2d(vertex_count));else
if(vecsize==3)return(new VB3d(vertex_count));else
if(vecsize==4)return(new VB4d(vertex_count));
}
return nullptr;
}
VK_NAMESPACE_END VK_NAMESPACE_END

4
src/SceneGraph/CMakeLists.txt
View File

@ -12,8 +12,8 @@ SOURCE_GROUP("Material" FILES ${SG_MATERIAL_HEADER}
SOURCE_GROUP("Material\\Shader" FILES ${SHADER_RESOURCE_FILES}) SOURCE_GROUP("Material\\Shader" FILES ${SHADER_RESOURCE_FILES})
SET(SG_VAB_SOURCE ${ROOT_INCLUDE_PATH}/hgl/graph/VertexAttribData.h SET(SG_VAB_SOURCE ${ROOT_INCLUDE_PATH}/hgl/graph/VertexAttribData.h
${ROOT_INCLUDE_PATH}/hgl/graph/VertexAttribBuffer.h) ${ROOT_INCLUDE_PATH}/hgl/graph/VertexAttribDataAccess.h)
SOURCE_GROUP("VertexAttribBuffer" FILES ${SG_VAB_SOURCE}) SOURCE_GROUP("VertexAttribBuffer" FILES ${SG_VAB_SOURCE})

8
src/SceneGraph/InlineGeometry.cpp
View File

@ -2,7 +2,7 @@
// GL to VK: swap Y/Z of position/normal/tangent/index // GL to VK: swap Y/Z of position/normal/tangent/index
#include<hgl/graph/InlineGeometry.h> #include<hgl/graph/InlineGeometry.h>
#include<hgl/graph/VertexAttribBuffer.h> #include<hgl/graph/VertexAttribDataAccess.h>
#include<hgl/graph/vulkan/VKDevice.h> #include<hgl/graph/vulkan/VKDevice.h>
#include<hgl/graph/vulkan/VKShaderModule.h> #include<hgl/graph/vulkan/VKShaderModule.h>
#include<hgl/graph/SceneDB.h> #include<hgl/graph/SceneDB.h>
@ -107,7 +107,7 @@ namespace hgl
void Finish(int binding,VertexAttribData *vb) void Finish(int binding,VertexAttribData *vb)
{ {
render_obj->Set(binding,db->CreateVAB(vb)); render_obj->Set(binding,db->CreateVAD(vb));
delete vb; delete vb;
} }
@ -151,9 +151,9 @@ namespace hgl
if(!rc.Init(4)) if(!rc.Init(4))
return(nullptr); return(nullptr);
VAD *vertex=rc.CreateVAB(VAN::Vertex); VAD *vertex=rc.CreateVAD(VAN::Vertex);
if(vertex->GetComponent()!=2) if(vertex->GetVulkanFormat()!=FMT_RG32F)
return(nullptr); return(nullptr);
vertex->WriteRectFan(rci->scope); vertex->WriteRectFan(rci->scope);

2
src/SceneGraph/RenderList.cpp
View File

@ -3,7 +3,7 @@
#include<hgl/graph/SceneNode.h> #include<hgl/graph/SceneNode.h>
#include<hgl/graph/vulkan/VKRenderable.h> #include<hgl/graph/vulkan/VKRenderable.h>
#include<hgl/graph/vulkan/VKCommandBuffer.h> #include<hgl/graph/vulkan/VKCommandBuffer.h>
#include<hgl/graph/VertexAttribBuffer.h> #include<hgl/graph/VertexAttribDataAccess.h>
#include<hgl/graph/RenderableInstance.h> #include<hgl/graph/RenderableInstance.h>
#include<hgl/graph/vulkan/VKMaterialInstance.h> #include<hgl/graph/vulkan/VKMaterialInstance.h>

4
src/SceneGraph/RenderableCreater.cpp
View File

@ -24,7 +24,7 @@ namespace hgl
return(true); return(true);
} }
VertexAttribData *RenderableCreater::CreateVAB(const AnsiString &name) VertexAttribData *RenderableCreater::CreateVAD(const AnsiString &name)
{ {
if(!vsm)return(false); if(!vsm)return(false);
@ -40,7 +40,7 @@ namespace hgl
ssb=new ShaderStageBind; ssb=new ShaderStageBind;
ssb->vabc=hgl::graph::CreateVABCreater(ss->base_type,ss->component,vertices_number); ssb->vabc=hgl::graph::CreateVertexAttribData(ss->base_type,ss->component,vertices_number);
ssb->name=name; ssb->name=name;
ssb->binding=ss->binding; ssb->binding=ss->binding;

20
src/SceneGraph/VertexAttribDataAccess.cpp Normal file
View File

@ -0,0 +1,20 @@
#include<hgl/graph/vulkan/VKFormat.h>
#include<hgl/graph/VertexAttribData.h>
#include<spirv_cross/spirv_common.hpp>
namespace hgl
{
namespace graph
{
VertexAttribData *CreateVertexAttribData(const uint32_t base_type,const uint32_t vecsize,const uint32_t vertex_count)
{
VkFormat fmt;
uint32_t stride;
if(!vulkan::GetVulkanFormatStrideBySPIRType(fmt,stride,base_type,vecsize))
return(nullptr);
return(new VertexAttribData(vertex_count,vecsize,stride,fmt));
}
}//namespace graph
}//namespace hgl

2
src/SceneGraph/shader/ShaderResource.cpp
View File

@ -39,7 +39,7 @@ VK_NAMESPACE_BEGIN
ss->base_type=*data++; ss->base_type=*data++;
ss->component=*data++; ss->component=*data++;
ss->format=VK_NAMESPACE::GetVulkanFormat(ss->base_type,ss->component); ss->format=VK_NAMESPACE::GetVulkanFormatBySPIRType(ss->base_type,ss->component);
str_len=*data++; str_len=*data++;
ss->name.SetString((char *)data,str_len); ss->name.SetString((char *)data,str_len);