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

[Mathias Fröhlich]

Module: Mesa
Branch: master
Commit: 62d41162bbde86b181afd9e550d49b918fa02831
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=62d41162bbde86b181afd9e550d49b918fa02831

Author: Mathias Fröhlich <mathias.froehlich at web.de>
Date:   Mon Aug  1 06:55:35 2016 +0200

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 at web.de>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Fredrik Höglund <fredrik at kde.org>

---

 src/mesa/main/attrib.c | 2 ++
 1 file changed, 2 insertions(+)

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;
 }