From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 8 Aug 2012 20:11:32 +0000 (-0700)
Subject: mesa/es3: Allow transpose matrix uniforms in GLES3
X-Git-Tag: mesa-9.1-rc1~455
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d47fe296025c4324b883ef6b9b08aa755ee52c0;p=platform%2Fupstream%2Fmesa.git

mesa/es3: Allow transpose matrix uniforms in GLES3

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index afe9a08..efff8f3 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -864,7 +864,8 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg,
 
    /* GL_INVALID_VALUE is generated if `transpose' is not GL_FALSE.
     * http://www.khronos.org/opengles/sdk/docs/man/xhtml/glUniform.xml */
-   if (ctx->API == API_OPENGLES || ctx->API == API_OPENGLES2) {
+   if (ctx->API == API_OPENGLES
+       || (ctx->API == API_OPENGLES2 && ctx->Version < 30)) {
       if (transpose) {
 	 _mesa_error(ctx, GL_INVALID_VALUE,
 		     "glUniformMatrix(matrix transpose is not GL_FALSE)");