summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorMathias Fröhlich <mathias.froehlich@web.de>2016-08-01 06:55:35 +0200
committerMathias Fröhlich <Mathias.Froehlich@gmx.net>2016-08-06 06:27:37 +0200
commit62d41162bbde86b181afd9e550d49b918fa02831 (patch)
tree7f4cb76125cffb44c3db0fb3938bb4d53e7884d0 /src/mesa
parentc495c18b24d6ea5ba346709daf673e2037172a39 (diff)
downloadexternal_mesa3d-62d41162bbde86b181afd9e550d49b918fa02831.zip
external_mesa3d-62d41162bbde86b181afd9e550d49b918fa02831.tar.gz
external_mesa3d-62d41162bbde86b181afd9e550d49b918fa02831.tar.bz2
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>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/attrib.c2
1 files changed, 2 insertions, 0 deletions
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;
}