commit a741b641ed8120c7f3b42ef5f22f4b268db9722e
author shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:40:10 2013 +0000
committer shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:40:10 2013 +0000
tree c3c852dd992eaead05f77a8b79fe74b40c15eb30
parent f130616e19a84f5b991aec4327ab041094d47b02

Add support for the transpose parameter of the glUniformMatrix family of functions in ES3.

TRAC #22839

Signed-off-by: Geoff Lang
Signed-off-by: Shanon Woods
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2139 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/ProgramBinary.h

diff --git a/src/libGLESv2/ProgramBinary.h b/src/libGLESv2/ProgramBinary.h
index 6dc3bde..f4a75b1 100644
--- a/src/libGLESv2/ProgramBinary.h
+++ b/src/libGLESv2/ProgramBinary.h
@@ -81,19 +81,19 @@
     bool setUniform2fv(GLint location, GLsizei count, const GLfloat *v);
     bool setUniform3fv(GLint location, GLsizei count, const GLfloat *v);
     bool setUniform4fv(GLint location, GLsizei count, const GLfloat *v);
-    bool setUniformMatrix2fv(GLint location, GLsizei count, const GLfloat *value);
-    bool setUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value);
-    bool setUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value);
+    bool setUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+    bool setUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+    bool setUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
     bool setUniform1iv(GLint location, GLsizei count, const GLint *v);
     bool setUniform2iv(GLint location, GLsizei count, const GLint *v);
     bool setUniform3iv(GLint location, GLsizei count, const GLint *v);
     bool setUniform4iv(GLint location, GLsizei count, const GLint *v);
-    bool setUniformMatrix2x3fv(GLint location, GLsizei count, const GLfloat *value);
-    bool setUniformMatrix3x2fv(GLint location, GLsizei count, const GLfloat *value);
-    bool setUniformMatrix2x4fv(GLint location, GLsizei count, const GLfloat *value);
-    bool setUniformMatrix4x2fv(GLint location, GLsizei count, const GLfloat *value);
-    bool setUniformMatrix3x4fv(GLint location, GLsizei count, const GLfloat *value);
-    bool setUniformMatrix4x3fv(GLint location, GLsizei count, const GLfloat *value);
+    bool setUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+    bool setUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+    bool setUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+    bool setUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+    bool setUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+    bool setUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
 
     bool getUniformfv(GLint location, GLsizei *bufSize, GLfloat *params);
     bool getUniformiv(GLint location, GLsizei *bufSize, GLint *params);
@@ -143,7 +143,7 @@
     std::string generatePointSpriteHLSL(int registers, const Varying *packing[][4], FragmentShader *fragmentShader, VertexShader *vertexShader) const;
 
     template <int cols, int rows>
-    bool setUniformMatrixfv(GLint location, GLsizei count, const GLfloat *value, GLenum targetUniformType);
+    bool setUniformMatrixfv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value, GLenum targetUniformType);
 
     rx::Renderer *const mRenderer;