Commit 0952e3cc authored by Philip Trettner's avatar Philip Trettner

Merge branch 'feature/suppress-uniform-warnings-for-gl-identifiers' into 'develop'

Suppress warnings for unchanged OpenGL identifiers

See merge request !33
parents f32e8ec9 2fcea5fc
...@@ -490,6 +490,10 @@ void Program::link(bool saveUniformState) ...@@ -490,6 +490,10 @@ void Program::link(bool saveUniformState)
glGetActiveUniform(mObjectName, GLuint(i), sizeof(uniformName), &length, &size, &type, uniformName); glGetActiveUniform(mObjectName, GLuint(i), sizeof(uniformName), &length, &size, &type, uniformName);
std::string uniformNameStd = uniformName; std::string uniformNameStd = uniformName;
// Skip reserved identifiers
if (uniformNameStd.find("gl_") == 0)
continue;
// Cut down uArray[0] to uArray // Cut down uArray[0] to uArray
auto const bracketPos = uniformNameStd.find('['); auto const bracketPos = uniformNameStd.find('[');
if (bracketPos != std::string::npos) if (bracketPos != std::string::npos)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment