On 03/26/2014 04:12 PM, Brian Paul wrote:
> The underlying glDrawArrays() calls weren't getting compiled into
> the display list. We simply need to use the current dispatch table
> so the CALL_DrawArrays() is routed to the display list save function.
>
> This patch also fixes glMultiModeDrawArraysIBM and
> glMultiModeDrawElementsIBM.
>
> Fixes the new piglit gl-1.4-dlist-multidrawarrays test.
>
> Cc: "10.0" "10.1" <mesa-sta...@lists.freedesktop.org>
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
> ---
> src/mesa/main/varray.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
> index b4b6fa9..b88d700 100644
> --- a/src/mesa/main/varray.c
> +++ b/src/mesa/main/varray.c
> @@ -1223,7 +1223,7 @@ _mesa_MultiDrawArrays( GLenum mode, const GLint *first,
>
> for (i = 0; i < primcount; i++) {
> if (count[i] > 0) {
> - CALL_DrawArrays(ctx->Exec, (mode, first[i], count[i]));
> + CALL_DrawArrays(ctx->CurrentDispatch, (mode, first[i], count[i]));
> }
> }
> }
> @@ -1243,7 +1243,7 @@ _mesa_MultiModeDrawArraysIBM( const GLenum * mode,
> const GLint * first,
> for ( i = 0 ; i < primcount ; i++ ) {
> if ( count[i] > 0 ) {
> GLenum m = *((GLenum *) ((GLubyte *) mode + i * modestride));
> - CALL_DrawArrays(ctx->Exec, ( m, first[i], count[i] ));
> + CALL_DrawArrays(ctx->CurrentDispatch, ( m, first[i], count[i] ));
> }
> }
> }
> @@ -1265,7 +1265,8 @@ _mesa_MultiModeDrawElementsIBM( const GLenum * mode,
> const GLsizei * count,
> for ( i = 0 ; i < primcount ; i++ ) {
> if ( count[i] > 0 ) {
> GLenum m = *((GLenum *) ((GLubyte *) mode + i * modestride));
> - CALL_DrawElements(ctx->Exec, ( m, count[i], type, indices[i] ));
> + CALL_DrawElements(ctx->CurrentDispatch, ( m, count[i], type,
> + indices[i] ));
> }
> }
> }
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
