diff --git a/inc/hgl/graph/VKDevice.h b/inc/hgl/graph/VKDevice.h index 683ae077..02535d08 100644 --- a/inc/hgl/graph/VKDevice.h +++ b/inc/hgl/graph/VKDevice.h @@ -224,7 +224,7 @@ public: //shader & material MaterialParameters *CreateMP(const MaterialDescriptorSets *,const PipelineLayoutData *,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 *); diff --git a/inc/hgl/graph/VKRenderResource.h b/inc/hgl/graph/VKRenderResource.h index bd6b49e2..f29f4f7c 100644 --- a/inc/hgl/graph/VKRenderResource.h +++ b/inc/hgl/graph/VKRenderResource.h @@ -88,7 +88,7 @@ public: // VBO/VAO 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 hgl::shadergen::MaterialCreateInfo *); diff --git a/inc/hgl/graph/VKShaderResource.h b/inc/hgl/graph/VKShaderResource.h index b157e08a..8189b3aa 100644 --- a/inc/hgl/graph/VKShaderResource.h +++ b/inc/hgl/graph/VKShaderResource.h @@ -13,14 +13,14 @@ class ShaderResource { VkShaderStageFlagBits stage_flag; - const void *spv_data; + const uint32_t *spv_data; uint32 spv_size; ShaderStageIO stage_io; public: - ShaderResource(const VkShaderStageFlagBits &,const void *,const uint32); + ShaderResource(const VkShaderStageFlagBits &,const uint32_t *,const uint32); virtual ~ShaderResource(); const VkShaderStageFlagBits GetStage ()const {return stage_flag;} diff --git a/src/SceneGraph/Vulkan/VKShaderModule.cpp b/src/SceneGraph/Vulkan/VKShaderModule.cpp index ee31c85e..6d730720 100644 --- a/src/SceneGraph/Vulkan/VKShaderModule.cpp +++ b/src/SceneGraph/Vulkan/VKShaderModule.cpp @@ -7,14 +7,14 @@ struct ShaderModuleCreateInfo:public vkstruct_flag(flag); 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);