Mesa (master): mesa: Unbind GL_TEXTURE_BUFFER on DeleteBuffers.
Kenneth Graunke
kwg at kemper.freedesktop.org
Mon Jun 11 20:37:28 UTC 2012
Module: Mesa
Branch: master
Commit: 45c21f852ec88fb4e784b53a1828d9a52d9dc67f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=45c21f852ec88fb4e784b53a1828d9a52d9dc67f
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sat Jun 9 21:44:58 2012 -0700
mesa: Unbind GL_TEXTURE_BUFFER on DeleteBuffers.
Fixes oglconform's tbo/basic.buffer.delete test.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/mesa/main/bufferobj.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 846260d..332af3d 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -848,6 +848,10 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
_mesa_BindBufferARB( GL_PIXEL_UNPACK_BUFFER_EXT, 0 );
}
+ if (ctx->Texture.BufferObject == bufObj) {
+ _mesa_BindBufferARB( GL_TEXTURE_BUFFER, 0 );
+ }
+
/* The ID is immediately freed for re-use */
_mesa_HashRemove(ctx->Shared->BufferObjects, ids[i]);
/* Make sure we do not run into the classic ABA problem on bind.
More information about the mesa-commit
mailing list