summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-02-12 18:44:07 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-02-12 18:44:07 +0000
commit59fdc051c2da28c137cf66f525398088c137bb48 (patch)
tree6fdd8499752b59d92af7a5a6c16993e08a5256ca
parent8b0a73c75f9d5e2ee27a08d556f9405c2b16ee58 (diff)
unlock mutex upon error return (Jeff Muizelaar)
-rw-r--r--src/mesa/main/bufferobj.c1
-rw-r--r--src/mesa/main/texobj.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 680ecf619f..0571d9584e 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -658,6 +658,7 @@ _mesa_GenBuffersARB(GLsizei n, GLuint *buffer)
GLenum target = 0;
bufObj = (*ctx->Driver.NewBufferObject)( ctx, name, target );
if (!bufObj) {
+ _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenBuffersARB");
return;
}
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 3da38acb26..b11a917f3b 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -617,6 +617,7 @@ _mesa_GenTextures( GLsizei n, GLuint *textures )
GLenum target = 0;
texObj = (*ctx->Driver.NewTextureObject)( ctx, name, target);
if (!texObj) {
+ _glthread_UNLOCK_MUTEX(GenTexturesLock);
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenTextures");
return;
}