diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2012-07-27 15:47:16 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-08-29 15:09:35 -0700 |
| commit | d6c8913bc629fedc520353cd9de51f1c7ba262a4 (patch) | |
| tree | f331a6d2518ddb2d9aa604d040fd1f2599810213 /src/mesa/main/matrix.c | |
| parent | 10e7db1ccf4d3b2023f04663f7a6c079eb6afc57 (diff) | |
| download | external_mesa3d-d6c8913bc629fedc520353cd9de51f1c7ba262a4.zip external_mesa3d-d6c8913bc629fedc520353cd9de51f1c7ba262a4.tar.gz external_mesa3d-d6c8913bc629fedc520353cd9de51f1c7ba262a4.tar.bz2 | |
mesa/es: Validate glMatrixMode mode in Mesa code rather than the ES wrapper
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/main/matrix.c')
| -rw-r--r-- | src/mesa/main/matrix.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c index b09fa4d..7157433 100644 --- a/src/mesa/main/matrix.c +++ b/src/mesa/main/matrix.c @@ -187,7 +187,7 @@ _mesa_MatrixMode( GLenum mode ) case GL_MATRIX5_NV: case GL_MATRIX6_NV: case GL_MATRIX7_NV: - if (ctx->Extensions.NV_vertex_program) { + if (ctx->API == API_OPENGL && ctx->Extensions.NV_vertex_program) { ctx->CurrentStack = &ctx->ProgramMatrixStack[mode - GL_MATRIX0_NV]; } else { @@ -203,8 +203,9 @@ _mesa_MatrixMode( GLenum mode ) case GL_MATRIX5_ARB: case GL_MATRIX6_ARB: case GL_MATRIX7_ARB: - if (ctx->Extensions.ARB_vertex_program || - ctx->Extensions.ARB_fragment_program) { + if (ctx->API == API_OPENGL + && (ctx->Extensions.ARB_vertex_program || + ctx->Extensions.ARB_fragment_program)) { const GLuint m = mode - GL_MATRIX0_ARB; if (m > ctx->Const.MaxProgramMatrices) { _mesa_error(ctx, GL_INVALID_ENUM, |