On 05/02/2012 01:12 AM, Jordan Justen wrote:
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.jus...@intel.com> Reviewed-by: Brian Paul<bri...@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)
Looks good. Do you need someone to commit this for you? -Brian _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
