OSDN Git Service

mesa: Don't resurrect deleted ARB VAOs in glPopClientAttrib
authorIan Romanick <ian.d.romanick@intel.com>
Sat, 21 Jan 2012 01:23:02 +0000 (17:23 -0800)
committerIan Romanick <ian.d.romanick@intel.com>
Sat, 28 Jan 2012 02:02:42 +0000 (18:02 -0800)
commit58e0c4f87272bfae09f522c8a1cfce112a04a3b2
tree77a44093207a86fc9fe7a23155edb63ea37e5244
parenteea63b7621740ad020b9a2448f9c2f809f4827f3
mesa: Don't resurrect deleted ARB VAOs in glPopClientAttrib

When ARB VAOs are used, glPopClientAttrib does not resurrect a deleted
VAO or VBO.  This difference between the two spec is, unfortunately,
not very well spelled out in the specs.

Fixes oglc vao(advanced.pushPop.deleteVAO) and
vao(advanced.pushPop.deleteVBO) tests.

NOTE: This is a candidate for release branches.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 34c353ce463960afdf64fa2be1f155b8b7f6c70c)
src/mesa/main/attrib.c