diff options
| author | Ian Romanick <[email protected]> | 2012-08-08 13:11:32 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2013-01-11 10:57:25 -0800 |
| commit | 8d47fe296025c4324b883ef6b9b08aa755ee52c0 (patch) | |
| tree | ad58ee7862a9ebc05fc59574d2b610bac445cbc6 /src/mesa/main/uniform_query.cpp | |
| parent | 5e918a3825ac34c1fc6e3d498adbfbe6e1001b47 (diff) | |
mesa/es3: Allow transpose matrix uniforms in GLES3
Signed-off-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/main/uniform_query.cpp')
| -rw-r--r-- | 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 afe9a08c184..efff8f381f1 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)"); |