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

use GetSPVData/GetSPVSize instead of GetCode/GetCodeSize

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-03-19 20:23:54 +08:00
parent 09277924f1
commit aed56a35e0
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,8 +26,8 @@ public:
const VkShaderStageFlagBits GetStage ()const {return stage_flag;} const VkShaderStageFlagBits GetStage ()const {return stage_flag;}
const char * GetStageName ()const {return GetShaderStageName(stage_flag);} const char * GetStageName ()const {return GetShaderStageName(stage_flag);}
const uint32_t * GetCode ()const {return (uint32_t *)spv_data;} const uint32_t * GetSPVData ()const {return spv_data;}
const uint32_t GetCodeSize ()const {return spv_size;} const uint32_t GetSPVSize ()const {return spv_size;}
ShaderAttributeArray & GetInputs () {return stage_io.input;} ShaderAttributeArray & GetInputs () {return stage_io.input;}
// ShaderAttributeArray & GetOutputs () {return stage_io.output;} // ShaderAttributeArray & GetOutputs () {return stage_io.output;}

4
inc/hgl/shadergen/ShaderCreateInfo.h
View File

@ -72,8 +72,8 @@ public:
bool CreateShader(ShaderCreateInfo *); bool CreateShader(ShaderCreateInfo *);
const uint32_t *GetCode()const; const uint32_t *GetSPVData()const;
const size_t GetCodeSize()const; const size_t GetSPVSize()const;
};//class ShaderCreateInfo };//class ShaderCreateInfo
SHADERGEN_NAMESPACE_END SHADERGEN_NAMESPACE_END
#endif//HGL_SHADER_CREATE_INFO_INCLUDE #endif//HGL_SHADER_CREATE_INFO_INCLUDE

8
src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp
View File

@ -145,7 +145,7 @@ Material *RenderResource::CreateMaterial(const OSString &filename)
{ {
shader_name=filename+OS_TEXT("?")+ToOSString(sr->GetStageName()); 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) if(sm)
{ {
@ -217,7 +217,7 @@ Material *RenderResource::CreateMaterial(const hgl::shadergen::MaterialCreateInf
{ {
sm=CreateShaderModule( mtl_name+OS_TEXT("?Vertex"), sm=CreateShaderModule( mtl_name+OS_TEXT("?Vertex"),
VK_SHADER_STAGE_VERTEX_BIT, VK_SHADER_STAGE_VERTEX_BIT,
vert->GetCode(),vert->GetCodeSize()); vert->GetSPVData(),vert->GetSPVSize());
if(sm) if(sm)
{ {
@ -234,7 +234,7 @@ Material *RenderResource::CreateMaterial(const hgl::shadergen::MaterialCreateInf
{ {
sm=CreateShaderModule( mtl_name+OS_TEXT("?Geometry"), sm=CreateShaderModule( mtl_name+OS_TEXT("?Geometry"),
VK_SHADER_STAGE_GEOMETRY_BIT, VK_SHADER_STAGE_GEOMETRY_BIT,
geom->GetCode(),geom->GetCodeSize()); geom->GetSPVData(),geom->GetSPVSize());
smm->Add(sm); smm->Add(sm);
} }
@ -245,7 +245,7 @@ Material *RenderResource::CreateMaterial(const hgl::shadergen::MaterialCreateInf
{ {
sm=CreateShaderModule( mtl_name+OS_TEXT("?Fragment"), sm=CreateShaderModule( mtl_name+OS_TEXT("?Fragment"),
VK_SHADER_STAGE_FRAGMENT_BIT, VK_SHADER_STAGE_FRAGMENT_BIT,
frag->GetCode(),frag->GetCodeSize()); frag->GetSPVData(),frag->GetSPVSize());
smm->Add(sm); smm->Add(sm);
} }

4
src/ShaderGen/ShaderCreateInfo.cpp
View File

@ -282,12 +282,12 @@ bool ShaderCreateInfo::CompileToSPV()
return(true); return(true);
} }
const uint32_t *ShaderCreateInfo::GetCode()const const uint32_t *ShaderCreateInfo::GetSPVData()const
{ {
return spv_data?spv_data->spv_data:nullptr; 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; return spv_data?spv_data->spv_length:0;
} }