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

used "uint32_t *" for SPVDATA

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-03-19 20:18:10 +08:00
parent 703d444cbb
commit c4a4ec5ebc
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,7 +224,7 @@ public: //shader & material
MaterialParameters *CreateMP(const MaterialDescriptorSets *,const PipelineLayoutData *,const DescriptorSetType &); MaterialParameters *CreateMP(const MaterialDescriptorSets *,const PipelineLayoutData *,const DescriptorSetType &);
MaterialParameters *CreateMP(Material *,const DescriptorSetType &); MaterialParameters *CreateMP(Material *,const DescriptorSetType &);
ShaderModule *CreateShaderModule(VkShaderStageFlagBits,const void *,const size_t); ShaderModule *CreateShaderModule(VkShaderStageFlagBits,const uint32_t *,const size_t);
Material *CreateMaterial(const UTF8String &mtl_name,ShaderModuleMap *shader_maps,MaterialDescriptorSets *,VertexInput *); Material *CreateMaterial(const UTF8String &mtl_name,ShaderModuleMap *shader_maps,MaterialDescriptorSets *,VertexInput *);

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

@ -88,7 +88,7 @@ public: // VBO/VAO
public: //Material public: //Material
const ShaderModule *CreateShaderModule(const OSString &filename,VkShaderStageFlagBits shader_stage,const void *spv_data,const size_t spv_size); const ShaderModule *CreateShaderModule(const OSString &filename,VkShaderStageFlagBits shader_stage,const uint32_t *spv_data,const size_t spv_size);
Material * CreateMaterial(const OSString &); Material * CreateMaterial(const OSString &);
Material * CreateMaterial(const hgl::shadergen::MaterialCreateInfo *); Material * CreateMaterial(const hgl::shadergen::MaterialCreateInfo *);

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

@ -13,14 +13,14 @@ class ShaderResource
{ {
VkShaderStageFlagBits stage_flag; VkShaderStageFlagBits stage_flag;
const void *spv_data; const uint32_t *spv_data;
uint32 spv_size; uint32 spv_size;
ShaderStageIO stage_io; ShaderStageIO stage_io;
public: public:
ShaderResource(const VkShaderStageFlagBits &,const void *,const uint32); ShaderResource(const VkShaderStageFlagBits &,const uint32_t *,const uint32);
virtual ~ShaderResource(); virtual ~ShaderResource();
const VkShaderStageFlagBits GetStage ()const {return stage_flag;} const VkShaderStageFlagBits GetStage ()const {return stage_flag;}

6
src/SceneGraph/Vulkan/VKShaderModule.cpp
View File

@ -7,14 +7,14 @@ struct ShaderModuleCreateInfo:public vkstruct_flag<VkShaderModuleCreateInfo,VK_S
{ {
public: public:
ShaderModuleCreateInfo(const void *spv_data,const size_t spv_size) ShaderModuleCreateInfo(const uint32_t *spv_data,const size_t spv_size)
{ {
codeSize=spv_size; codeSize=spv_size;
pCode =(const uint32_t *)spv_data; pCode =spv_data;
} }
};//struct ShaderModuleCreateInfo };//struct ShaderModuleCreateInfo
ShaderModule *GPUDevice::CreateShaderModule(VkShaderStageFlagBits shader_stage,const void *spv_data,const size_t spv_size) ShaderModule *GPUDevice::CreateShaderModule(VkShaderStageFlagBits shader_stage,const uint32_t *spv_data,const size_t spv_size)
{ {
if(!spv_data||spv_size<4)return(nullptr); if(!spv_data||spv_size<4)return(nullptr);

4
src/SceneGraph/Vulkan/VKShaderResource.cpp
View File

@ -38,7 +38,7 @@ VK_NAMESPACE_BEGIN
} }
}//namespcae }//namespcae
ShaderResource::ShaderResource(const VkShaderStageFlagBits &flag,const void *sd,const uint32 size) ShaderResource::ShaderResource(const VkShaderStageFlagBits &flag,const uint32_t *sd,const uint32 size)
{ {
stage_flag=flag; stage_flag=flag;
spv_data=sd; spv_data=sd;
@ -94,7 +94,7 @@ VK_NAMESPACE_BEGIN
cbr.CastRead<uint32>(flag); cbr.CastRead<uint32>(flag);
cbr.Read(spv_size); cbr.Read(spv_size);
ShaderResource *sr=new ShaderResource(flag,cbr.CurPointer(),spv_size); ShaderResource *sr=new ShaderResource(flag,(const uint32_t *)cbr.CurPointer(),spv_size);
cbr.Skip(spv_size); cbr.Skip(spv_size);