LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 08:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

In fact, lets just replace Shader:getUniformVariable with Shader:hasUniform. The latter returns true if the uniform with the specified name exists and contributes to the final output of the shader.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-09-01 18:32:12 -03:00
parent ee79038572
commit 7a904de2e1
3 changed files with 9 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Shader.cpp
+2 -14
View File
@@ -621,21 +621,9 @@ int Shader::getTextureUnit(const std::string &name)
return texunit;
}
Shader::UniformType Shader::getUniformVariable(const std::string &name, int &components, int &count)
bool Shader::hasUniform(const std::string &name) const
{
auto it = uniforms.find(name);
if (it == uniforms.end())
{
components = 0;
count = 0;
return UNIFORM_UNKNOWN;
}
components = getUniformTypeSize(it->second.type);
count = (int) it->second.count;
return it->second.baseType;
return uniforms.find(name) != uniforms.end();
}
GLint Shader::getAttribLocation(const std::string &name)