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

fixed a bug that Init after error position.

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy)
2023-02-17 12:10:14 +08:00
parent 532421fea7
commit d2568072c7
1 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
glsl2spv.cpp
View File

@@ -326,7 +326,6 @@ extern "C"
uint32_t *spv_data; uint32_t *spv_data;
uint32_t spv_length; uint32_t spv_length;
uint32_t shader_stage;
ShaderStageData input,output; ShaderStageData input,output;
ShaderResourceData resource[VK_DESCRIPTOR_TYPE_COUNT]; ShaderResourceData resource[VK_DESCRIPTOR_TYPE_COUNT];
@@ -338,18 +337,6 @@ extern "C"
memset(this,0,sizeof(SPVData)); memset(this,0,sizeof(SPVData));
} }
void Clear()
{
for(uint32_t i=0;i<VK_DESCRIPTOR_TYPE_COUNT;i++)
delete[] resource[i].items;
delete[] push_constant.items;
delete[] subpass_input.items;
delete[] input.items;
delete[] output.items;
}
public: public:
SPVData(const char *l,const char *dl) SPVData(const char *l,const char *dl)
@@ -370,6 +357,8 @@ extern "C"
SPVData(const std::vector<uint32_t> &spirv) SPVData(const std::vector<uint32_t> &spirv)
{ {
Init();
result=true; result=true;
log=nullptr; log=nullptr;
@@ -379,13 +368,18 @@ extern "C"
spv_data=new uint32_t[spv_length]; spv_data=new uint32_t[spv_length];
spv_length*=sizeof(uint32_t); spv_length*=sizeof(uint32_t);
memcpy(spv_data,spirv.data(),spv_length); memcpy(spv_data,spirv.data(),spv_length);
Init();
} }
~SPVData() ~SPVData()
{ {
Clear(); for(uint32_t i=0;i<VK_DESCRIPTOR_TYPE_COUNT;i++)
delete[] resource[i].items;
delete[] push_constant.items;
delete[] subpass_input.items;
delete[] input.items;
delete[] output.items;
delete[] log; delete[] log;
delete[] debug_log; delete[] debug_log;
@@ -488,8 +482,8 @@ extern "C"
} }
SPVData *Shader2SPV( SPVData *Shader2SPV(
const uint32_t shader_stage, const uint32_t shader_stage,
const char * shader_source, const char * shader_source,
const CompileInfo * compile_info) const CompileInfo * compile_info)
{ {
EShLanguage stage = FindLanguage((VkShaderStageFlagBits)shader_stage); EShLanguage stage = FindLanguage((VkShaderStageFlagBits)shader_stage);
@@ -521,7 +515,7 @@ extern "C"
for (uint32_t i = 0; i < compile_info->includes_count; i++) for (uint32_t i = 0; i < compile_info->includes_count; i++)
{ {
includer.pushExternalLocalDirectory(compile_info->includes[i]); includer.pushExternalLocalDirectory(compile_info->includes[i]);
} }
} }
if(compile_info->preamble) if(compile_info->preamble)
@@ -558,8 +552,6 @@ extern "C"
glslang::GlslangToSpv(*program.getIntermediate(stage),spirv); glslang::GlslangToSpv(*program.getIntermediate(stage),spirv);
SPVData *spv=new SPVData(spirv); SPVData *spv=new SPVData(spirv);
spv->shader_stage = shader_stage;
{ {
ShaderParse sp(spirv.data(),(uint32_t)spirv.size()*sizeof(uint32_t)); ShaderParse sp(spirv.data(),(uint32_t)spirv.size()*sizeof(uint32_t));