summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-02-12 18:43:38 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-02-12 18:43:38 +0000
commit2752177ade76f36229dda8da42948b173bdf08bc (patch)
tree194dade6e88ac46490987a3cffed1b02ef36944a
parentf640ee2f6e1b69e332b46e48b3b4e9f33bbc6e39 (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 3ca08859a7..3629ffef87 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -689,6 +689,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 e6e39d4b43..488edab872 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -565,6 +565,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;
}