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

修正ShaderModuleManage::CreateShader在加载spv文件时的不正确处理

Browse Source
This commit is contained in:
hyzboy 2019-07-02 20:06:23 +08:00
parent 7557909ea5
commit 6509bee5c5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/RenderDevice/Vulkan/VKShaderModuleManage.cpp
View File

@ -27,6 +27,9 @@ ShaderModuleManage::~ShaderModuleManage()
const ShaderModule *ShaderModuleManage::CreateShader(const VkShaderStageFlagBits shader_stage_bit,const void *spv_data,const uint32_t spv_size) const ShaderModule *ShaderModuleManage::CreateShader(const VkShaderStageFlagBits shader_stage_bit,const void *spv_data,const uint32_t spv_size)
{ {
if(!spv_data||spv_size<=0)
return(nullptr);
VkPipelineShaderStageCreateInfo *shader_stage=new VkPipelineShaderStageCreateInfo; VkPipelineShaderStageCreateInfo *shader_stage=new VkPipelineShaderStageCreateInfo;
shader_stage->sType=VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; shader_stage->sType=VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
shader_stage->pNext=nullptr; shader_stage->pNext=nullptr;
@ -63,11 +66,10 @@ const ShaderModule *ShaderModuleManage::CreateShader(const VkShaderStageFlagBits
const ShaderModule *ShaderModuleManage::CreateShader(const VkShaderStageFlagBits shader_stage_bit,const OSString &filename) const ShaderModule *ShaderModuleManage::CreateShader(const VkShaderStageFlagBits shader_stage_bit,const OSString &filename)
{ {
uint32_t spv_size;
void *spv_data; void *spv_data;
spv_size=hgl::filesystem::LoadFileToMemory(filename,&spv_data); int64 spv_size=hgl::filesystem::LoadFileToMemory(filename,&spv_data);
if(!spv_data) if(spv_size<=0)
return(nullptr); return(nullptr);
const ShaderModule *sm=CreateShader(shader_stage_bit,spv_data,spv_size); const ShaderModule *sm=CreateShader(shader_stage_bit,spv_data,spv_size);