mesa/es3: Allow transpose matrix uniforms in GLES3
authorIan Romanick <ian.d.romanick@intel.com>
Wed, 8 Aug 2012 20:11:32 +0000 (13:11 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Fri, 11 Jan 2013 18:57:25 +0000 (10:57 -0800)
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
src/mesa/main/uniform_query.cpp

index afe9a08c1842b1665bea5517c999bbef4581ce7f..efff8f381f1d8d3485e831e916f2c594c696bf89 100644 (file)
@@ -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)");