Mesa (master): mesa: Add primitive restart support to glArrayElement
Jordan Justen
jljusten at kemper.freedesktop.org
Sun May 6 03:36:44 UTC 2012
Module: Mesa
Branch: master
Commit: 5795d3b5aec767dc2d7901b432f9182121b8e46f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5795d3b5aec767dc2d7901b432f9182121b8e46f
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Tue May 1 00:01:08 2012 -0700
mesa: Add primitive restart support to glArrayElement
When primitive restart is enabled, and glArrayElement is called
with the restart index value, then call glPrimitiveRestartNV.
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Brian Paul<brianp at vmware.com>
---
src/mesa/main/api_arrayelt.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index 7bf55f3..6de6de2 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/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)
More information about the mesa-commit
mailing list