summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2015-11-05 14:48:58 -0800
committerIan Romanick <[email protected]>2015-11-24 11:36:06 -0800
commit3d2bf5a5f52a83ac9330403e2abec3dff33ee224 (patch)
tree7827b7e219d8d64a77b8e0e87cf41b600a313902
parentd1b7a1f5afdd39ca939b86bb0bc54c7400dd56a4 (diff)
meta: Don't save or restore the VBO binding
Nothing left in meta does anything with the VBO binding, so we don't need to save or restore it. The VAO binding is still modified. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Anuj Phogat <[email protected]> (cherry picked from commit c63f9c735dfbd572b671f739ba5df0c2ad9a388a)
-rw-r--r--src/mesa/drivers/common/meta.c6
-rw-r--r--src/mesa/drivers/common/meta.h1
2 files changed, 0 insertions, 7 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 3fbac0735a7..55b061dd30a 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -745,8 +745,6 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
/* save vertex array object state */
_mesa_reference_vao(ctx, &save->VAO,
ctx->Array.VAO);
- _mesa_reference_buffer_object(ctx, &save->ArrayBufferObj,
- ctx->Array.ArrayBufferObj);
/* set some default state? */
}
@@ -1156,10 +1154,6 @@ _mesa_meta_end(struct gl_context *ctx)
}
if (state & MESA_META_VERTEX) {
- /* restore vertex buffer object */
- _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, save->ArrayBufferObj->Name);
- _mesa_reference_buffer_object(ctx, &save->ArrayBufferObj, NULL);
-
/* restore vertex array object */
_mesa_BindVertexArray(save->VAO->Name);
_mesa_reference_vao(ctx, &save->VAO, NULL);
diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h
index cee8e48819f..ae6e2b5ae1b 100644
--- a/src/mesa/drivers/common/meta.h
+++ b/src/mesa/drivers/common/meta.h
@@ -156,7 +156,6 @@ struct save_state
/** MESA_META_VERTEX */
struct gl_vertex_array_object *VAO;
- struct gl_buffer_object *ArrayBufferObj;
/** MESA_META_VIEWPORT */
GLfloat ViewportX, ViewportY, ViewportW, ViewportH;