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

newly PrimitiveData struct and Primitive class. Can't Run!!!

Browse Source 
next step is to support PrimitiveVDM.
This commit is contained in:
hyzboy
2024-05-23 02:19:40 +08:00
parent e27442a0b4
commit 40ce978f85
14 changed files with 509 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
inc/hgl/graph/PrimitiveCreater.h
View File

@@ -7,9 +7,6 @@
#include<hgl/graph/VKVertexAttribBuffer.h>
VK_NAMESPACE_BEGIN
class VertexDataManager;
struct PrimitiveData;
/**
* 可绘制图元创建器
*/
@@ -24,34 +21,38 @@ protected:
protected:
PrimitiveData * prim_data;
void_pointer vab_map_ptr[HGL_MAX_VERTEX_ATTRIB_COUNT];
AnsiString prim_name; ///<名称
PrimitiveData * prim_data; ///<图元数据
VkDeviceSize vertices_number;
IndexBuffer * ibo;
void * ibo_map;
VkDeviceSize vertices_number; ///<顶点数量
uint vab_proc_count; ///<操作的vab数量
VkDeviceSize index_number; ///<索引数量
IndexBuffer * ibo;
void * ibo_map;
protected:
template<typename T> friend class VABRawMap;
template<typename T> friend class VABMap;
VABAccess *AcquirePVB(const AnsiString &,const VkFormat &,const void *data); ///<请求一个顶点属性数据区
void ClearAllData();
public:
PrimitiveCreater(GPUDevice *,const VIL *);
PrimitiveCreater(GPUDevice *,const VIL *,const AnsiString &name);
//PrimitiveCreater(VertexDataManager *);
virtual ~PrimitiveCreater();
virtual ~PrimitiveCreater()
{
ClearAllData();
}
virtual bool Init(const VkDeviceSize vertices_count,const VkDeviceSize index_count,IndexType it=IndexType::AUTO); ///<初始化，参数为顶点数量
const VkDeviceSize GetVertexCount()const{ return vertices_number; } ///<取得顶点数量
bool WriteVAB(const AnsiString &name,const void *data,const uint32_t bytes); ///<直接写入顶点属性数据
VABAccess * AcquirePVB (const AnsiString &name,const VkFormat &format,const void *data=nullptr,const VkDeviceSize bytes=0); ///<请求一个顶点属性数据区
bool WriteVAB (const AnsiString &name,const VkFormat &format,const void *data,const uint32_t bytes) ///<直接写入顶点属性数据
{
return AcquirePVB(name,format,data,bytes);
}
const IndexType GetIndexType()const{return ibo?ibo->GetType():IndexType::ERR;} ///<取得索引数据类型
@@ -61,6 +62,9 @@ public:
if(!ibo)return(nullptr);
if(ibo->GetStride()!=sizeof(T))return(nullptr);
if(!ibo_map)
ibo_map=ibo->Map();
return (T *)ibo_map;
}
@@ -69,12 +73,19 @@ public:
if(!ibo)return(false);
if(ibo->GetStride()!=sizeof(T))return(false);
hgl_cpy<T>((T *)ibo_map,data,index_number);
if(ibo_map)
{
hgl_cpy<T>((T *)ibo_map,data,index_number);
ibo->Unmap();
ibo_map=nullptr;
}
else
ibo->Write(data);
return(true);
}
virtual Primitive * Finish(RenderResource *,const AnsiString &); ///<结束并创建可渲染对象
virtual Primitive * Finish(RenderResource *); ///<结束并创建可渲染对象
};//class PrimitiveCreater
/**
@@ -87,19 +98,25 @@ template<typename T> class VABRawMap
public:
VABRawMap(PrimitiveCreater *pc,const AnsiString &name)
VABRawMap(PrimitiveCreater *pc,const VkFormat &format,const AnsiString &name)
{
vaba=pc->AcquirePVB(name,T::GetVulkanFormat(),nullptr);
vaba=pc->AcquirePVB(name,format);
map_ptr=(T *)(vaba->vab->Map(vaba->start,vaba->count));
if(vaba)
map_ptr=(T *)(vaba->vab->Map(vaba->start,vaba->count));
else
map_ptr=nullptr;
}
~VABRawMap()
{
vaba->vab->Unmap();
if(vaba)
vaba->vab->Unmap();
}
T *operator->(){ return map_ptr; }
const bool IsValid()const{ return vaba; }
operator T *(){ return map_ptr; }
};//template<typename T> class VABRawMap
typedef VABRawMap<int8> VABRawMapi8, VABRawMapByte;
@@ -125,23 +142,34 @@ public:
{
vaba=pc->AcquirePVB(name,T::GetVulkanFormat(),nullptr);
void *map_ptr=vaba->vab->Map(vaba->start,vaba->count);
if(vaba)
{
void *map_ptr=vaba->vab->Map(vaba->start,vaba->count);
vb=T::Create(pc->GetVertexCount(),map_ptr);
vb=T::Create(pc->GetVertexCount(),map_ptr);
vb->Begin();
vb->Begin();
}
else
{
vb=nullptr;
}
}
~VABMap()
{
vaba->vab->Unmap();
if(vaba)
vaba->vab->Unmap();
}
void Restart()
{
vb->Begin();
if(vb)
vb->Begin();
}
const bool IsValid()const{ return vb; }
T *operator->(){ return vb; }
};//template<typename T> class VABMap

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

@@ -122,6 +122,7 @@ struct PrimitiveData;
class Primitive;
class Renderable;
class VertexDataManager;
class RenderResource;
enum class SharingMode

29
inc/hgl/graph/VKPrimitive.h
View File

@@ -3,10 +3,9 @@
#include<hgl/type/Map.h>
#include<hgl/type/String.h>
#include<hgl/graph/AABB.h>
#include<hgl/graph/VKPrimitiveData.h>
#include<hgl/graph/VK.h>
VK_NAMESPACE_BEGIN
/**
* 单一图元数据访问接口<br>
*
@@ -26,31 +25,35 @@ class Primitive
protected:
AnsiString prim_name;
PrimitiveData *prim_data;
protected:
AABB BoundingBox;
public:
protected:
Primitive(const AnsiString &n)
Primitive(const AnsiString &pn,PrimitiveData *pd)
{
prim_name=n;
prim_name=pn;
prim_data=pd;
}
virtual ~Primitive()=0;
public:
virtual ~Primitive()=default;
public:
virtual const VkDeviceSize GetVertexCount ()const=0;
virtual const int GetVACount ()const=0;
virtual const bool GetVABAccess (const AnsiString &,VABAccess *)=0;
virtual const IBAccess * GetIBAccess ()const=0;
const AnsiString & GetName ()const{ return prim_name; }
const VkDeviceSize GetVertexCount ()const;
const int GetVACount ()const;
VABAccess * GetVABAccess (const AnsiString &);
IBAccess * GetIBAccess ();
const AABB & GetBoundingBox ()const{return BoundingBox;}
const AABB & GetBoundingBox ()const{return BoundingBox;}
};//class Primitive
Primitive *CreatePrimitive(const PrimitiveData *);
Primitive *CreatePrimitivePrivate(const AnsiString &,PrimitiveData *);
Primitive *CreatePrimitivePrivate(VertexDataManager *,const AnsiString &,PrimitiveData *);
VK_NAMESPACE_END

40
inc/hgl/graph/VKPrimitiveData.h
View File

@@ -1,40 +0,0 @@
#pragma once
#include<hgl/graph/VKVertexInputLayout.h>
#include<hgl/graph/VKVertexAttribBuffer.h>
#include<hgl/graph/VKIndexBuffer.h>
#include<hgl/graph/AABB.h>
VK_NAMESPACE_BEGIN
/*
1.截止2024.4.27，根据vulkan.gpuinfo.org统计，只有9%的设备maxVertexInputAttributes为16，不存在低于16的设备。
9.0%的设备为28 - 31
70.7%的设备为32
9.6%的设备为64
由于我们暂时没有发现需要使用16个以上属性的情况，所以这里暂定使用16。
(如果时间过去久远，可再次查询此值是否可改成更高的值，以及是否需要)
2.为何va_name使用char[][]而不是String以及动态分配内存？
就是为了必避动态分配内存，以及可以直接memcpy处理，所以此处这样定义。
*/
struct PrimitiveData
{
const VIL * vil;
VkDeviceSize vertex_count;
VABAccess vab_access[HGL_MAX_VERTEX_ATTRIB_COUNT];
IBAccess ib_access;
};//struct PrimitiveData
bool InitPrimitiveData( PrimitiveData *pd,const VIL *_vil,const VkDeviceSize vc);
int GetVABIndex(const PrimitiveData *pd,const AnsiString &name);
VABAccess * GetVAB( PrimitiveData *pd,const int);
VABAccess * SetVAB( PrimitiveData *pd,const int,VAB *vab,VkDeviceSize start,VkDeviceSize count);
void SetIndexBuffer( PrimitiveData *pd,IndexBuffer *ib,const VkDeviceSize ic);
VK_NAMESPACE_END

3
inc/hgl/graph/VKRenderResource.h
View File

@@ -147,7 +147,8 @@ public: //Material
MaterialInstance * CreateMaterialInstance(const mtl::MaterialCreateInfo *,const VILConfig *vil_cfg=nullptr);
Primitive * CreatePrimitive(const AnsiString &,const uint32_t vertex_count=0);
Primitive * CreatePrimitive( const AnsiString &,PrimitiveData *);
Primitive * CreatePrimitive(VertexDataManager *,const AnsiString &,PrimitiveData *);
Renderable * CreateRenderable(Primitive *r,MaterialInstance *mi,Pipeline *p);

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

@@ -9,8 +9,6 @@ namespace hgl
{
namespace graph
{
class VertexDataManager;
struct IBAccessNode:public IBAccess
{
private: