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

changed many size/count type why to equal vkCmdDraw/vkCmdDrawIndexed

Browse Source
This commit is contained in:
hyzboy
2024-05-26 15:04:44 +08:00
parent bf5e401566
commit 9947d46ab8
6 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/SceneGraph/Vulkan/VKPrimitiveData.cpp
View File

@@ -7,7 +7,7 @@
VK_NAMESPACE_BEGIN
PrimitiveData::PrimitiveData(const VIL *_vil,const VkDeviceSize vc)
PrimitiveData::PrimitiveData(const VIL *_vil,const uint32_t vc)
{
vil=_vil;
@@ -100,7 +100,7 @@ namespace
VertexDataManager *GetVDM(){return nullptr;}
PrimitiveDataPrivateBuffer(GPUDevice *dev,const VIL *_vil,const VkDeviceSize vc):PrimitiveData(_vil,vc)
PrimitiveDataPrivateBuffer(GPUDevice *dev,const VIL *_vil,const uint32_t vc):PrimitiveData(_vil,vc)
{
device=dev;
}
@@ -127,7 +127,7 @@ namespace
}
}
IBAccess *InitIBO(const VkDeviceSize index_count,IndexType it) override
IBAccess *InitIBO(const uint32_t index_count,IndexType it) override
{
if(!device)return(nullptr);
@@ -201,7 +201,7 @@ namespace
VertexDataManager *GetVDM(){return vdm;}
PrimitiveDataVDM(VertexDataManager *_vdm,const VkDeviceSize vc):PrimitiveData(_vdm->GetVIL(),vc)
PrimitiveDataVDM(VertexDataManager *_vdm,const uint32_t vc):PrimitiveData(_vdm->GetVIL(),vc)
{
vdm=_vdm;
@@ -218,7 +218,7 @@ namespace
vdm->ReleaseVAB(vab_node);
}
IBAccess *InitIBO(const VkDeviceSize index_count,IndexType it) override
IBAccess *InitIBO(const uint32_t index_count,IndexType it) override
{
if(index_count<=0)return(nullptr);
if(!vdm)return(nullptr);
@@ -277,7 +277,7 @@ namespace
};//class PrimitiveDataVDM:public PrimitiveData
}//namespace
PrimitiveData *CreatePrimitiveData(GPUDevice *dev,const VIL *_vil,const VkDeviceSize vc)
PrimitiveData *CreatePrimitiveData(GPUDevice *dev,const VIL *_vil,const uint32_t vc)
{
if(!dev)return(nullptr);
if(!_vil)return(nullptr);
@@ -286,7 +286,7 @@ PrimitiveData *CreatePrimitiveData(GPUDevice *dev,const VIL *_vil,const VkDevice
return(new PrimitiveDataPrivateBuffer(dev,_vil,vc));
}
PrimitiveData *CreatePrimitiveData(VertexDataManager *vdm,const VkDeviceSize vc)
PrimitiveData *CreatePrimitiveData(VertexDataManager *vdm,const uint32_t vc)
{
if(!vdm)return(nullptr);
if(vc<=0)return(nullptr);

12
src/SceneGraph/Vulkan/VKPrimitiveData.h
View File

@@ -21,19 +21,19 @@ protected:
const VIL * vil;
VkDeviceSize vertex_count;
uint32_t vertex_count;
VABAccess *vab_access;
IBAccess ib_access;
public:
PrimitiveData(const VIL *_vil,const VkDeviceSize vc);
PrimitiveData(const VIL *_vil,const uint32_t vc);
virtual ~PrimitiveData();
public:
const VkDeviceSize GetVertexCount ()const{return vertex_count;}
const uint32_t GetVertexCount ()const{return vertex_count;}
const int GetVABCount ()const;
const int GetVABIndex (const AnsiString &name)const;
VABAccess * GetVABAccess (const int index);
@@ -48,10 +48,10 @@ public:
public:
virtual IBAccess * InitIBO(const VkDeviceSize index_count,IndexType it)=0;
virtual IBAccess * InitIBO(const uint32_t index_count,IndexType it)=0;
virtual VABAccess *InitVAB(const AnsiString &name,const VkFormat &format,const void *data)=0;
};//class PrimitiveData
PrimitiveData *CreatePrimitiveData(GPUDevice *dev,const VIL *_vil,const VkDeviceSize vc);
PrimitiveData *CreatePrimitiveData(VertexDataManager *vdm,const VkDeviceSize vc);
PrimitiveData *CreatePrimitiveData(GPUDevice *dev,const VIL *_vil,const uint32_t vc);
PrimitiveData *CreatePrimitiveData(VertexDataManager *vdm,const uint32_t vc);
VK_NAMESPACE_END