Module: Mesa Branch: master Commit: 8d47fe296025c4324b883ef6b9b08aa755ee52c0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d47fe296025c4324b883ef6b9b08aa755ee52c0
Author: Ian Romanick <[email protected]> Date: Wed Aug 8 13:11:32 2012 -0700 mesa/es3: Allow transpose matrix uniforms in GLES3 Signed-off-by: Ian Romanick <[email protected]> --- src/mesa/main/uniform_query.cpp | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) 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)"); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
