AuroraMiddleware/HLSLcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed memory leaks in HLSLcc (based on c2bba9b89c)

Browse Source
This commit is contained in:
Antti Tapaninen 2018-12-22 17:45:17 -08:00
parent 7b1f85206f
commit 11377f61c8
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/toGLSLDeclaration.cpp
View File

@ -701,24 +701,31 @@ void ToGLSL::AddUserOutput(const Declaration* psDecl)
renderTarget = 0;
index = 1;
}
bdestroy(layoutQualifier);
layoutQualifier = bformat("layout(location = %d, index = %d) ", renderTarget, index);
}
else
{
bdestroy(layoutQualifier);
layoutQualifier = bformat("layout(location = %d) ", renderTarget);
}
}
auto lq = bstr2cstr(layoutQualifier, '\0');
if (haveFramebufferFetch)
{
bcatcstr(glsl, "#ifdef GL_EXT_shader_framebuffer_fetch\n");
bformata(glsl, "%sinout %s%s %s;\n", bstr2cstr(layoutQualifier, '\0'), Precision, type->data, OutputName);
bformata(glsl, "%sinout %s%s %s;\n", lq, Precision, type->data, OutputName);
bcatcstr(glsl, "#else\n");
bformata(glsl, "%sout %s%s %s;\n", bstr2cstr(layoutQualifier, '\0'), Precision, type->data, OutputName);
bformata(glsl, "%sout %s%s %s;\n", lq, Precision, type->data, OutputName);
bcatcstr(glsl, "#endif\n");
}
else
bformata(glsl, "%sout %s%s %s;\n", bstr2cstr(layoutQualifier, '\0'), Precision, type->data, OutputName);
bformata(glsl, "%sout %s%s %s;\n", lq, Precision, type->data, OutputName);
bcstrfree(lq);
bdestroy(layoutQualifier);
}
}
break;
@ -2182,24 +2189,31 @@ void ToGLSL::TranslateDeclaration(const Declaration* psDecl)
renderTarget = 0;
index = 1;
}
bdestroy(layoutQualifier);
layoutQualifier = bformat("layout(location = %d, index = %d) ", renderTarget, index);
}
else
{
bdestroy(layoutQualifier);
layoutQualifier = bformat("layout(location = %d) ", renderTarget);
}
}
auto lq = bstr2cstr(layoutQualifier, '\0');
if (haveFramebufferFetch)
{
bcatcstr(glsl, "#ifdef GL_EXT_shader_framebuffer_fetch\n");
bformata(glsl, "%sinout %s %s %s;\n", bstr2cstr(layoutQualifier, '\0'), Precision, type->data, OutputName);
bformata(glsl, "%sinout %s %s %s;\n", lq, Precision, type->data, OutputName);
bcatcstr(glsl, "#else\n");
bformata(glsl, "%sout %s %s %s;\n", bstr2cstr(layoutQualifier, '\0'), Precision, type->data, OutputName);
bformata(glsl, "%sout %s %s %s;\n", lq, Precision, type->data, OutputName);
bcatcstr(glsl, "#endif\n");
}
else
bformata(glsl, "%sout %s %s %s;\n", bstr2cstr(layoutQualifier, '\0'), Precision, type->data, OutputName);
bformata(glsl, "%sout %s %s %s;\n", lq, Precision, type->data, OutputName);
bcstrfree(lq);
bdestroy(layoutQualifier);
}
}
break;

1
src/toGLSLInstruction.cpp
View File

@ -3439,6 +3439,7 @@ void ToGLSL::TranslateInstruction(Instruction* psInst, bool isEmbedded /* = fals
int hardcoded_iteration_limit = (psContext->psShader->eShaderType == PIXEL_SHADER) ? 0x7FFF : 0x7FFFFFFF;
bformata(glsl, "for(int %s = 0 ; %s < 0x%X ; %s++){\n", name->data, name->data, hardcoded_iteration_limit, name->data);
bdestroy(name);
}
else
{