From: Mathias Fröhlich <mathias.froehlich@web.de>
Date: Mon, 1 Aug 2016 04:55:35 +0000 (+0200)
Subject: mesa: Copy bitmask of VBOs in the VAO on gl{Push,Pop}Attrib.
X-Git-Tag: upstream/17.1.0~7560
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62d41162bbde86b181afd9e550d49b918fa02831;p=platform%2Fupstream%2Fmesa.git

mesa: Copy bitmask of VBOs in the VAO on gl{Push,Pop}Attrib.

On gl{Push,Pop}Attrib(GL_CLIENT_VERTEX_ARRAY_BIT) take
care that gl_vertex_array_object::VertexAttribBufferMask
matches the bound buffer object in the
gl_vertex_array_object::VertexBinding array.

Signed-off-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Fredrik Höglund <fredrik@kde.org>
---

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index f859191..ff5f0f1 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1489,6 +1489,8 @@ copy_array_object(struct gl_context *ctx,
 
    /* _Enabled must be the same than on push */
    dest->_Enabled = src->_Enabled;
+   /* The bitmask of bound VBOs needs to match the VertexBinding array */
+   dest->VertexAttribBufferMask = src->VertexAttribBufferMask;
    dest->NewArrays = src->NewArrays;
 }