Implement ES3.1 glProgramUniform* entry points
BUG=angleproject:1589
TEST=dEQP-GLES31.functional.program_uniform.*
Change-Id: I27fffa755fd277ed918746259cac88ab9e349c41
Reviewed-on: https://chromium-review.googlesource.com/412193
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
diff --git a/src/libANGLE/renderer/gl/ProgramGL.cpp b/src/libANGLE/renderer/gl/ProgramGL.cpp
index 8e7045f..9d74ef7 100644
--- a/src/libANGLE/renderer/gl/ProgramGL.cpp
+++ b/src/libANGLE/renderer/gl/ProgramGL.cpp
@@ -188,32 +188,67 @@
void ProgramGL::setUniform1fv(GLint location, GLsizei count, const GLfloat *v)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniform1fv(uniLoc(location), count, v);
+ if (mFunctions->programUniform1fv != nullptr)
+ {
+ mFunctions->programUniform1fv(mProgramID, uniLoc(location), count, v);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniform1fv(uniLoc(location), count, v);
+ }
}
void ProgramGL::setUniform2fv(GLint location, GLsizei count, const GLfloat *v)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniform2fv(uniLoc(location), count, v);
+ if (mFunctions->programUniform2fv != nullptr)
+ {
+ mFunctions->programUniform2fv(mProgramID, uniLoc(location), count, v);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniform2fv(uniLoc(location), count, v);
+ }
}
void ProgramGL::setUniform3fv(GLint location, GLsizei count, const GLfloat *v)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniform3fv(uniLoc(location), count, v);
+ if (mFunctions->programUniform3fv != nullptr)
+ {
+ mFunctions->programUniform3fv(mProgramID, uniLoc(location), count, v);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniform3fv(uniLoc(location), count, v);
+ }
}
void ProgramGL::setUniform4fv(GLint location, GLsizei count, const GLfloat *v)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniform4fv(uniLoc(location), count, v);
+ if (mFunctions->programUniform4fv != nullptr)
+ {
+ mFunctions->programUniform4fv(mProgramID, uniLoc(location), count, v);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniform4fv(uniLoc(location), count, v);
+ }
}
void ProgramGL::setUniform1iv(GLint location, GLsizei count, const GLint *v)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniform1iv(uniLoc(location), count, v);
+ if (mFunctions->programUniform1iv != nullptr)
+ {
+ mFunctions->programUniform1iv(mProgramID, uniLoc(location), count, v);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniform1iv(uniLoc(location), count, v);
+ }
const gl::VariableLocation &locationEntry = mState.getUniformLocations()[location];
@@ -230,98 +265,216 @@
void ProgramGL::setUniform2iv(GLint location, GLsizei count, const GLint *v)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniform2iv(uniLoc(location), count, v);
+ if (mFunctions->programUniform2iv != nullptr)
+ {
+ mFunctions->programUniform2iv(mProgramID, uniLoc(location), count, v);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniform2iv(uniLoc(location), count, v);
+ }
}
void ProgramGL::setUniform3iv(GLint location, GLsizei count, const GLint *v)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniform3iv(uniLoc(location), count, v);
+ if (mFunctions->programUniform3iv != nullptr)
+ {
+ mFunctions->programUniform3iv(mProgramID, uniLoc(location), count, v);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniform3iv(uniLoc(location), count, v);
+ }
}
void ProgramGL::setUniform4iv(GLint location, GLsizei count, const GLint *v)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniform4iv(uniLoc(location), count, v);
+ if (mFunctions->programUniform4iv != nullptr)
+ {
+ mFunctions->programUniform4iv(mProgramID, uniLoc(location), count, v);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniform4iv(uniLoc(location), count, v);
+ }
}
void ProgramGL::setUniform1uiv(GLint location, GLsizei count, const GLuint *v)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniform1uiv(uniLoc(location), count, v);
+ if (mFunctions->programUniform1uiv != nullptr)
+ {
+ mFunctions->programUniform1uiv(mProgramID, uniLoc(location), count, v);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniform1uiv(uniLoc(location), count, v);
+ }
}
void ProgramGL::setUniform2uiv(GLint location, GLsizei count, const GLuint *v)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniform2uiv(uniLoc(location), count, v);
+ if (mFunctions->programUniform2uiv != nullptr)
+ {
+ mFunctions->programUniform2uiv(mProgramID, uniLoc(location), count, v);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniform2uiv(uniLoc(location), count, v);
+ }
}
void ProgramGL::setUniform3uiv(GLint location, GLsizei count, const GLuint *v)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniform3uiv(uniLoc(location), count, v);
+ if (mFunctions->programUniform3uiv != nullptr)
+ {
+ mFunctions->programUniform3uiv(mProgramID, uniLoc(location), count, v);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniform3uiv(uniLoc(location), count, v);
+ }
}
void ProgramGL::setUniform4uiv(GLint location, GLsizei count, const GLuint *v)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniform4uiv(uniLoc(location), count, v);
+ if (mFunctions->programUniform4uiv != nullptr)
+ {
+ mFunctions->programUniform4uiv(mProgramID, uniLoc(location), count, v);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniform4uiv(uniLoc(location), count, v);
+ }
}
void ProgramGL::setUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniformMatrix2fv(uniLoc(location), count, transpose, value);
+ if (mFunctions->programUniformMatrix2fv != nullptr)
+ {
+ mFunctions->programUniformMatrix2fv(mProgramID, uniLoc(location), count, transpose, value);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniformMatrix2fv(uniLoc(location), count, transpose, value);
+ }
}
void ProgramGL::setUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniformMatrix3fv(uniLoc(location), count, transpose, value);
+ if (mFunctions->programUniformMatrix3fv != nullptr)
+ {
+ mFunctions->programUniformMatrix3fv(mProgramID, uniLoc(location), count, transpose, value);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniformMatrix3fv(uniLoc(location), count, transpose, value);
+ }
}
void ProgramGL::setUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniformMatrix4fv(uniLoc(location), count, transpose, value);
+ if (mFunctions->programUniformMatrix4fv != nullptr)
+ {
+ mFunctions->programUniformMatrix4fv(mProgramID, uniLoc(location), count, transpose, value);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniformMatrix4fv(uniLoc(location), count, transpose, value);
+ }
}
void ProgramGL::setUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniformMatrix2x3fv(uniLoc(location), count, transpose, value);
+ if (mFunctions->programUniformMatrix2x3fv != nullptr)
+ {
+ mFunctions->programUniformMatrix2x3fv(mProgramID, uniLoc(location), count, transpose,
+ value);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniformMatrix2x3fv(uniLoc(location), count, transpose, value);
+ }
}
void ProgramGL::setUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniformMatrix3x2fv(uniLoc(location), count, transpose, value);
+ if (mFunctions->programUniformMatrix3x2fv != nullptr)
+ {
+ mFunctions->programUniformMatrix3x2fv(mProgramID, uniLoc(location), count, transpose,
+ value);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniformMatrix3x2fv(uniLoc(location), count, transpose, value);
+ }
}
void ProgramGL::setUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniformMatrix2x4fv(uniLoc(location), count, transpose, value);
+ if (mFunctions->programUniformMatrix2x4fv != nullptr)
+ {
+ mFunctions->programUniformMatrix2x4fv(mProgramID, uniLoc(location), count, transpose,
+ value);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniformMatrix2x4fv(uniLoc(location), count, transpose, value);
+ }
}
void ProgramGL::setUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniformMatrix4x2fv(uniLoc(location), count, transpose, value);
+ if (mFunctions->programUniformMatrix4x2fv != nullptr)
+ {
+ mFunctions->programUniformMatrix4x2fv(mProgramID, uniLoc(location), count, transpose,
+ value);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniformMatrix4x2fv(uniLoc(location), count, transpose, value);
+ }
}
void ProgramGL::setUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniformMatrix3x4fv(uniLoc(location), count, transpose, value);
+ if (mFunctions->programUniformMatrix3x4fv != nullptr)
+ {
+ mFunctions->programUniformMatrix3x4fv(mProgramID, uniLoc(location), count, transpose,
+ value);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniformMatrix3x4fv(uniLoc(location), count, transpose, value);
+ }
}
void ProgramGL::setUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
{
- mStateManager->useProgram(mProgramID);
- mFunctions->uniformMatrix4x3fv(uniLoc(location), count, transpose, value);
+ if (mFunctions->programUniformMatrix4x3fv != nullptr)
+ {
+ mFunctions->programUniformMatrix4x3fv(mProgramID, uniLoc(location), count, transpose,
+ value);
+ }
+ else
+ {
+ mStateManager->useProgram(mProgramID);
+ mFunctions->uniformMatrix4x3fv(uniLoc(location), count, transpose, value);
+ }
}
void ProgramGL::setUniformBlockBinding(GLuint uniformBlockIndex, GLuint uniformBlockBinding)