diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-09 16:07:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-09 16:07:11 +0200 |
| commit | 58780b4306bd1254c6c0e65d255630d5c546005f (patch) | |
| tree | 71c3b3842ee282b0228246840f5006c369684ab7 /mesalib/src/mesa/main/api_arrayelt.c | |
| parent | 38e785557684536d03fff096d56d5db61cc42e8a (diff) | |
| parent | 8a448108ec0bc3a0a488b2234e0d12aee503c67c (diff) | |
| download | vcxsrv-58780b4306bd1254c6c0e65d255630d5c546005f.tar.gz vcxsrv-58780b4306bd1254c6c0e65d255630d5c546005f.tar.bz2 vcxsrv-58780b4306bd1254c6c0e65d255630d5c546005f.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/api_arrayelt.c')
| -rw-r--r-- | mesalib/src/mesa/main/api_arrayelt.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/api_arrayelt.c b/mesalib/src/mesa/main/api_arrayelt.c index 7bf55f319..6de6de2b7 100644 --- a/mesalib/src/mesa/main/api_arrayelt.c +++ b/mesalib/src/mesa/main/api_arrayelt.c @@ -1643,12 +1643,20 @@ void GLAPIENTRY _ae_ArrayElement( GLint elt ) const struct _glapi_table * const disp = GET_DISPATCH(); GLboolean do_map; + /* If PrimitiveRestart is enabled and the index is the RestartIndex + * then we call PrimitiveRestartNV and return. + */ + if (ctx->Array.PrimitiveRestart && (elt == ctx->Array.RestartIndex)) { + CALL_PrimitiveRestartNV((struct _glapi_table *)disp, ()); + return; + } + if (actx->NewState) { assert(!actx->mapped_vbos); _ae_update_state( ctx ); } - /* Determine if w need to map/unmap VBOs */ + /* Determine if we need to map/unmap VBOs */ do_map = actx->nr_vbos && !actx->mapped_vbos; if (do_map) |