diff --git a/inc/hgl/graph/VKShaderResource.h b/inc/hgl/graph/VKShaderResource.h index 8189b3aa..8830fd35 100644 --- a/inc/hgl/graph/VKShaderResource.h +++ b/inc/hgl/graph/VKShaderResource.h @@ -26,8 +26,8 @@ public: const VkShaderStageFlagBits GetStage ()const {return stage_flag;} const char * GetStageName ()const {return GetShaderStageName(stage_flag);} - const uint32_t * GetCode ()const {return (uint32_t *)spv_data;} - const uint32_t GetCodeSize ()const {return spv_size;} + const uint32_t * GetSPVData ()const {return spv_data;} + const uint32_t GetSPVSize ()const {return spv_size;} ShaderAttributeArray & GetInputs () {return stage_io.input;} // ShaderAttributeArray & GetOutputs () {return stage_io.output;} diff --git a/inc/hgl/shadergen/ShaderCreateInfo.h b/inc/hgl/shadergen/ShaderCreateInfo.h index 71b1f7f5..71e7e31d 100644 --- a/inc/hgl/shadergen/ShaderCreateInfo.h +++ b/inc/hgl/shadergen/ShaderCreateInfo.h @@ -72,8 +72,8 @@ public: bool CreateShader(ShaderCreateInfo *); - const uint32_t *GetCode()const; - const size_t GetCodeSize()const; + const uint32_t *GetSPVData()const; + const size_t GetSPVSize()const; };//class ShaderCreateInfo SHADERGEN_NAMESPACE_END #endif//HGL_SHADER_CREATE_INFO_INCLUDE diff --git a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp index d1d7eee6..6dcbae6d 100644 --- a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp @@ -145,7 +145,7 @@ Material *RenderResource::CreateMaterial(const OSString &filename) { shader_name=filename+OS_TEXT("?")+ToOSString(sr->GetStageName()); - sm=CreateShaderModule(shader_name,sr->GetStage(),sr->GetCode(),sr->GetCodeSize()); + sm=CreateShaderModule(shader_name,sr->GetStage(),sr->GetSPVData(),sr->GetSPVSize()); if(sm) { @@ -217,7 +217,7 @@ Material *RenderResource::CreateMaterial(const hgl::shadergen::MaterialCreateInf { sm=CreateShaderModule( mtl_name+OS_TEXT("?Vertex"), VK_SHADER_STAGE_VERTEX_BIT, - vert->GetCode(),vert->GetCodeSize()); + vert->GetSPVData(),vert->GetSPVSize()); if(sm) { @@ -234,7 +234,7 @@ Material *RenderResource::CreateMaterial(const hgl::shadergen::MaterialCreateInf { sm=CreateShaderModule( mtl_name+OS_TEXT("?Geometry"), VK_SHADER_STAGE_GEOMETRY_BIT, - geom->GetCode(),geom->GetCodeSize()); + geom->GetSPVData(),geom->GetSPVSize()); smm->Add(sm); } @@ -245,7 +245,7 @@ Material *RenderResource::CreateMaterial(const hgl::shadergen::MaterialCreateInf { sm=CreateShaderModule( mtl_name+OS_TEXT("?Fragment"), VK_SHADER_STAGE_FRAGMENT_BIT, - frag->GetCode(),frag->GetCodeSize()); + frag->GetSPVData(),frag->GetSPVSize()); smm->Add(sm); } diff --git a/src/ShaderGen/ShaderCreateInfo.cpp b/src/ShaderGen/ShaderCreateInfo.cpp index 8ddf49f8..560328a3 100644 --- a/src/ShaderGen/ShaderCreateInfo.cpp +++ b/src/ShaderGen/ShaderCreateInfo.cpp @@ -282,12 +282,12 @@ bool ShaderCreateInfo::CompileToSPV() return(true); } -const uint32_t *ShaderCreateInfo::GetCode()const +const uint32_t *ShaderCreateInfo::GetSPVData()const { return spv_data?spv_data->spv_data:nullptr; } -const size_t ShaderCreateInfo::GetCodeSize()const +const size_t ShaderCreateInfo::GetSPVSize()const { return spv_data?spv_data->spv_length:0; }