Skip to content

S
swiftshader
Commit ec5da193 by Alexis Hetu Committed by Alexis Hétu
Options

Do not assign a location to uniform block members

Uniform block members do not get a uniform location, since they cannot be set (or get) through regular glUniform* functions. These are instead always set using uniform buffers. Bug chromium:763675,chromium:763698,chromium:771639 Change-Id: Icf65eba3faab420c63f70af66f828a786e3fc446 Reviewed-on: https://swiftshader-review.googlesource.com/13068Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarAlexis Hétu <sugoi@google.com>
parent e75d3348
Showing with 36 additions and 17 deletions
src/OpenGL/libGLESv2/Program.cpp
...@@ -364,7 +364,7 @@ namespace es2 ...@@ -364,7 +364,7 @@ namespace es2
return TEXTURE_2D; return TEXTURE_2D;
} }
GLint Program::getUniformLocation(const std::string &name) const bool Program::isUniformDefined(const std::string &name) const
{ {
unsigned int subscript = GL_INVALID_INDEX; unsigned int subscript = GL_INVALID_INDEX;
std::string baseName = es2::ParseUniformName(name, &subscript); std::string baseName = es2::ParseUniformName(name, &subscript);
...@@ -372,11 +372,29 @@ namespace es2 ...@@ -372,11 +372,29 @@ namespace es2
size_t numUniforms = uniformIndex.size(); size_t numUniforms = uniformIndex.size();
for(size_t location = 0; location < numUniforms; location++) for(size_t location = 0; location < numUniforms; location++)
{ {
const int index = uniformIndex[location].index; const unsigned int index = uniformIndex[location].index;
const bool isArray = uniforms[index]->isArray(); if((uniformIndex[location].name == baseName) && ((index == GL_INVALID_INDEX) ||
((uniforms[index]->isArray() && uniformIndex[location].element == subscript) ||
(subscript == GL_INVALID_INDEX))))
{
return true;
}
}
return false;
}
GLint Program::getUniformLocation(const std::string &name) const
{
unsigned int subscript = GL_INVALID_INDEX;
std::string baseName = es2::ParseUniformName(name, &subscript);
if(uniformIndex[location].name == baseName && size_t numUniforms = uniformIndex.size();
((isArray && uniformIndex[location].element == subscript) || for(size_t location = 0; location < numUniforms; location++)
{
const unsigned int index = uniformIndex[location].index;
if((index != GL_INVALID_INDEX) && (uniformIndex[location].name == baseName) &&
((uniforms[index]->isArray() && uniformIndex[location].element == subscript) ||
(subscript == GL_INVALID_INDEX))) (subscript == GL_INVALID_INDEX)))
{ {
return (GLint)location; return (GLint)location;
...@@ -494,7 +512,7 @@ namespace es2 ...@@ -494,7 +512,7 @@ namespace es2
static GLenum floatType[] = { GL_FLOAT, GL_FLOAT_VEC2, GL_FLOAT_VEC3, GL_FLOAT_VEC4 }; static GLenum floatType[] = { GL_FLOAT, GL_FLOAT_VEC2, GL_FLOAT_VEC3, GL_FLOAT_VEC4 };
static GLenum boolType[] = { GL_BOOL, GL_BOOL_VEC2, GL_BOOL_VEC3, GL_BOOL_VEC4 }; static GLenum boolType[] = { GL_BOOL, GL_BOOL_VEC2, GL_BOOL_VEC3, GL_BOOL_VEC4 };
if(location < 0 || location >= (int)uniformIndex.size()) if(location < 0 || location >= (int)uniformIndex.size() || (uniformIndex[location].index == GL_INVALID_INDEX))
{ {
return false; return false;
} }
...@@ -584,7 +602,7 @@ namespace es2 ...@@ -584,7 +602,7 @@ namespace es2
return false; return false;
} }
if(location < 0 || location >= (int)uniformIndex.size()) if(location < 0 || location >= (int)uniformIndex.size() || (uniformIndex[location].index == GL_INVALID_INDEX))
{ {
return false; return false;
} }
...@@ -681,7 +699,7 @@ namespace es2 ...@@ -681,7 +699,7 @@ namespace es2
bool Program::setUniform1iv(GLint location, GLsizei count, const GLint *v) bool Program::setUniform1iv(GLint location, GLsizei count, const GLint *v)
{ {
if(location < 0 || location >= (int)uniformIndex.size()) if(location < 0 || location >= (int)uniformIndex.size() || (uniformIndex[location].index == GL_INVALID_INDEX))
{ {
return false; return false;
} }
...@@ -738,7 +756,7 @@ namespace es2 ...@@ -738,7 +756,7 @@ namespace es2
static GLenum uintType[] = { GL_UNSIGNED_INT, GL_UNSIGNED_INT_VEC2, GL_UNSIGNED_INT_VEC3, GL_UNSIGNED_INT_VEC4 }; static GLenum uintType[] = { GL_UNSIGNED_INT, GL_UNSIGNED_INT_VEC2, GL_UNSIGNED_INT_VEC3, GL_UNSIGNED_INT_VEC4 };
static GLenum boolType[] = { GL_BOOL, GL_BOOL_VEC2, GL_BOOL_VEC3, GL_BOOL_VEC4 }; static GLenum boolType[] = { GL_BOOL, GL_BOOL_VEC2, GL_BOOL_VEC3, GL_BOOL_VEC4 };
if(location < 0 || location >= (int)uniformIndex.size()) if(location < 0 || location >= (int)uniformIndex.size() || (uniformIndex[location].index == GL_INVALID_INDEX))
{ {
return false; return false;
} }
...@@ -800,7 +818,7 @@ namespace es2 ...@@ -800,7 +818,7 @@ namespace es2
bool Program::setUniform1uiv(GLint location, GLsizei count, const GLuint *v) bool Program::setUniform1uiv(GLint location, GLsizei count, const GLuint *v)
{ {
if(location < 0 || location >= (int)uniformIndex.size()) if(location < 0 || location >= (int)uniformIndex.size() || (uniformIndex[location].index == GL_INVALID_INDEX))
{ {
return false; return false;
} }
...@@ -857,7 +875,7 @@ namespace es2 ...@@ -857,7 +875,7 @@ namespace es2
static GLenum uintType[] = { GL_UNSIGNED_INT, GL_UNSIGNED_INT_VEC2, GL_UNSIGNED_INT_VEC3, GL_UNSIGNED_INT_VEC4 }; static GLenum uintType[] = { GL_UNSIGNED_INT, GL_UNSIGNED_INT_VEC2, GL_UNSIGNED_INT_VEC3, GL_UNSIGNED_INT_VEC4 };
static GLenum boolType[] = { GL_BOOL, GL_BOOL_VEC2, GL_BOOL_VEC3, GL_BOOL_VEC4 }; static GLenum boolType[] = { GL_BOOL, GL_BOOL_VEC2, GL_BOOL_VEC3, GL_BOOL_VEC4 };
if(location < 0 || location >= (int)uniformIndex.size()) if(location < 0 || location >= (int)uniformIndex.size() || (uniformIndex[location].index == GL_INVALID_INDEX))
{ {
return false; return false;
} }
...@@ -919,7 +937,7 @@ namespace es2 ...@@ -919,7 +937,7 @@ namespace es2
bool Program::getUniformfv(GLint location, GLsizei *bufSize, GLfloat *params) bool Program::getUniformfv(GLint location, GLsizei *bufSize, GLfloat *params)
{ {
if(location < 0 || location >= (int)uniformIndex.size()) if(location < 0 || location >= (int)uniformIndex.size() || (uniformIndex[location].index == GL_INVALID_INDEX))
{ {
return false; return false;
} }
...@@ -977,7 +995,7 @@ namespace es2 ...@@ -977,7 +995,7 @@ namespace es2
bool Program::getUniformiv(GLint location, GLsizei *bufSize, GLint *params) bool Program::getUniformiv(GLint location, GLsizei *bufSize, GLint *params)
{ {
if(location < 0 || location >= (int)uniformIndex.size()) if(location < 0 || location >= (int)uniformIndex.size() || (uniformIndex[location].index == GL_INVALID_INDEX))
{ {
return false; return false;
} }
...@@ -1026,7 +1044,7 @@ namespace es2 ...@@ -1026,7 +1044,7 @@ namespace es2
bool Program::getUniformuiv(GLint location, GLsizei *bufSize, GLuint *params) bool Program::getUniformuiv(GLint location, GLsizei *bufSize, GLuint *params)
{ {
if(location < 0 || location >= (int)uniformIndex.size()) if(location < 0 || location >= (int)uniformIndex.size() || (uniformIndex[location].index == GL_INVALID_INDEX))
{ {
return false; return false;
} }
...@@ -1088,7 +1106,7 @@ namespace es2 ...@@ -1088,7 +1106,7 @@ namespace es2
GLint numUniforms = static_cast<GLint>(uniformIndex.size()); GLint numUniforms = static_cast<GLint>(uniformIndex.size());
for(GLint location = 0; location < numUniforms; location++) for(GLint location = 0; location < numUniforms; location++)
{ {
if(uniformIndex[location].element != 0) if((uniformIndex[location].element != 0) || (uniformIndex[location].index == GL_INVALID_INDEX))
{ {
continue; continue;
} }
...@@ -1799,10 +1817,10 @@ namespace es2 ...@@ -1799,10 +1817,10 @@ namespace es2
} }
else UNREACHABLE(shader); else UNREACHABLE(shader);
if(location == -1) // Not previously defined if(!isUniformDefined(name))
{ {
uniforms.push_back(uniform); uniforms.push_back(uniform);
unsigned int index = static_cast<unsigned int>(uniforms.size() - 1); unsigned int index = (blockInfo.index == -1) ? static_cast<unsigned int>(uniforms.size() - 1) : GL_INVALID_INDEX;
for(int i = 0; i < uniform->size(); i++) for(int i = 0; i < uniform->size(); i++)
{ {
......
src/OpenGL/libGLESv2/Program.h
...@@ -144,6 +144,7 @@ namespace es2 ...@@ -144,6 +144,7 @@ namespace es2
GLuint getUniformBlockBinding(GLuint uniformBlockIndex) const; GLuint getUniformBlockBinding(GLuint uniformBlockIndex) const;
void getActiveUniformBlockiv(GLuint uniformBlockIndex, GLenum pname, GLint *params) const; void getActiveUniformBlockiv(GLuint uniformBlockIndex, GLenum pname, GLint *params) const;
bool isUniformDefined(const std::string &name) const;
GLint getUniformLocation(const std::string &name) const; GLint getUniformLocation(const std::string &name) const;
bool setUniform1fv(GLint location, GLsizei count, const GLfloat *v); bool setUniform1fv(GLint location, GLsizei count, const GLfloat *v);
bool setUniform2fv(GLint location, GLsizei count, const GLfloat *v); bool setUniform2fv(GLint location, GLsizei count, const GLfloat *v);
......
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