Attachment 89044 Details for Bug 71492 – patch

[patch] patch

0001-mesa-Fix-derived-vertex-state-not-being-updated-in-g.patch (text/plain), 2.17 KB, created by Fredrik Höglund on 2013-11-11 18:43:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fredrik Höglund

Created: 2013-11-11 18:43:25 UTC

Size: 2.17 KB

patch

obsolete

>From 197675e6487e64f476915c77f2508bc2c030ebbc Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= <fredrik@kde.org>
>Date: Mon, 11 Nov 2013 18:54:15 +0100
>Subject: [PATCH] mesa: Fix derived vertex state not being updated in
> glCallList()
>
>AEcontext::NewState is not always set when the vertex array state
>is changed.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71492
>Cc: "10.0" <mesa-stable@lists.freedesktop.org>
>---
> src/mesa/main/api_arrayelt.c |   22 ++++++++++++++++------
> 1 file changed, 16 insertions(+), 6 deletions(-)
>
>diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
>index 6822465..c9d4d03 100644
>--- a/src/mesa/main/api_arrayelt.c
>+++ b/src/mesa/main/api_arrayelt.c
>@@ -1469,6 +1469,18 @@ check_vbo(AEcontext *actx, struct gl_buffer_object *vbo)
> }
> 
> 
>+static inline void
>+update_derived_client_arrays(struct gl_context *ctx)
>+{
>+   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
>+
>+   if (arrayObj->NewArrays) {
>+      _mesa_update_array_object_client_arrays(ctx, arrayObj);
>+      arrayObj->NewArrays = 0;
>+   }
>+}
>+
>+
> /**
>  * Make a list of per-vertex functions to call for each glArrayElement call.
>  * These functions access the array data (i.e. glVertex, glColor, glNormal,
>@@ -1486,12 +1498,6 @@ _ae_update_state(struct gl_context *ctx)
> 
>    actx->nr_vbos = 0;
> 
>-   if (arrayObj->NewArrays) {
>-      /* update the derived client arrays */
>-      _mesa_update_array_object_client_arrays(ctx, arrayObj);
>-      arrayObj->NewArrays = 0;
>-   }
>-
>    /* conventional vertex arrays */
>    if (arrayObj->_VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Enabled) {
>       aa->array = &arrayObj->_VertexAttrib[VERT_ATTRIB_COLOR_INDEX];
>@@ -1618,6 +1624,8 @@ _ae_map_vbos(struct gl_context *ctx)
>    if (actx->mapped_vbos)
>       return;
> 
>+   update_derived_client_arrays(ctx);
>+
>    if (actx->NewState)
>       _ae_update_state(ctx);
> 
>@@ -1669,6 +1677,8 @@ _ae_ArrayElement(GLint elt)
>    const struct _glapi_table * const disp = GET_DISPATCH();
>    GLboolean do_map;
> 
>+   update_derived_client_arrays(ctx);
>+
>    /* If PrimitiveRestart is enabled and the index is the RestartIndex
>     * then we call PrimitiveRestartNV and return.
>     */
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 71492: 89027 | 89044

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.