mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-05 15:05:36 +00:00
Code Issues Projects Releases Wiki Activity

Revert reordering of shader preprocessing statements.

Browse Source 
Position of "shader_body" is reused in the next find call, which was broken because of the changed order.
This commit is contained in:
Kai Blaschke
2022-12-07 23:06:02 +01:00
parent b585017ba3
commit 28340ce32f
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/libprojectM/Renderer/ShaderEngine.cpp
View File

@ -154,21 +154,8 @@ GLuint ShaderEngine::compilePresetShader(const PresentShaderType shaderType, Sha
throw ShaderException("Preset shader is missing \"shader_body\" entry point.");
}
// replace "}" with return statement (this can probably be optimized for the GLSL conversion...)
found = program.rfind('}');
if (found != std::string::npos)
{
//std::cout << "last '}' found at: " << int(found) << std::endl;
program.replace(int(found), 1, "_return_value = float4(ret.xyz, 1.0);\n"
"}\n");
}
else
{
throw ShaderException("Preset shader has no closing brace.");
}
// replace "{" with some variable declarations
found = program.find('{',found);
// replace the "{" immediately following shader_body with some variable declarations
found = program.find('{', found);
if (found != std::string::npos)
{
//std::cout << "first '{' found at: " << int(found) << std::endl;
@ -182,6 +169,20 @@ GLuint ShaderEngine::compilePresetShader(const PresentShaderType shaderType, Sha
throw ShaderException("Preset shader has no opening braces.");
}
// replace "}" with return statement (this can probably be optimized for the GLSL conversion...)
found = program.rfind('}');
if (found != std::string::npos)
{
//std::cout << "last '}' found at: " << int(found) << std::endl;
program.replace(int(found), 1, "_return_value = float4(ret.xyz, 1.0);\n"
"}\n");
}
else
{
throw ShaderException("Preset shader has no closing brace.");
}
// Find matching closing brace and cut off excess text after shader's main function
int bracesOpen = 1;
size_t pos = found + 1;