diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
| commit | 8db4c7567d495ef6f6162406394ac192e6c2cfe7 (patch) | |
| tree | 9d8233b2f54ad198da3354aa9dbd8d0082156a9c /mesalib/src/mesa/main/api_validate.c | |
| parent | c14f2432d6bfb3de6c6289efd0471f038a289327 (diff) | |
| parent | 50ace52bb8308fd62b8bad9ae912dc18c4ae32ff (diff) | |
| download | vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.gz vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.bz2 vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/api_validate.c')
| -rw-r--r-- | mesalib/src/mesa/main/api_validate.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/api_validate.c b/mesalib/src/mesa/main/api_validate.c index 1ae491f25..4e94f47e3 100644 --- a/mesalib/src/mesa/main/api_validate.c +++ b/mesalib/src/mesa/main/api_validate.c @@ -383,6 +383,12 @@ _mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint fi return GL_FALSE; } + if (first < 0) { + _mesa_error(ctx, GL_INVALID_VALUE, + "glDrawArraysInstanced(start=%d)", first); + return GL_FALSE; + } + if (!_mesa_valid_prim_mode(ctx, mode)) { _mesa_error(ctx, GL_INVALID_ENUM, "glDrawArraysInstanced(mode=0x%x)", mode); @@ -399,12 +405,6 @@ _mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint fi if (!check_valid_to_render(ctx, "glDrawArraysInstanced(invalid to render)")) return GL_FALSE; - if (ctx->CompileFlag) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "glDrawArraysInstanced(display list"); - return GL_FALSE; - } - if (ctx->Const.CheckArrayBounds) { if (first + count > (GLint) ctx->Array.ArrayObj->_MaxElement) return GL_FALSE; |