check for framebuffer completeness, code clean-up

[mesa.git] / src / mesa / main / texobj.c

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index e6e39d4b434754f846e53205dc2baa45ed482c53..c4cfe3310c85babd555f073414b5a1b39f9d73cd 100644 (file)
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -40,6 +40,9 @@
 #include "texobj.h"
 #include "mtypes.h"
 
+#ifdef __VMS
+#define _mesa_sprintf sprintf
+#endif
 
 /**********************************************************************/
 /** \name Internal functions */
@@ -144,7 +147,7 @@ _mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *texObj )
    for (face = 0; face < 6; face++) {
       for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {
         if (texObj->Image[face][i]) {
-           _mesa_delete_texture_image( texObj->Image[face][i] );
+           _mesa_delete_texture_image( ctx, texObj->Image[face][i] );
         }
       }
    }
@@ -246,7 +249,7 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
    /* Always need the base level image */
    if (!t->Image[0][baseLevel]) {
       char s[100];
-      sprintf(s, "obj %p (%d) Image[baseLevel=%d] == NULL",
+      _mesa_sprintf(s, "obj %p (%d) Image[baseLevel=%d] == NULL",
               (void *) t, t->Name, baseLevel);
       incomplete(t, s);
       t->Complete = GL_FALSE;
@@ -565,6 +568,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;
       }