Mesa (master): mesa: remove pointless null ptr check, improved some error messages

Brian Paul brianp at kemper.freedesktop.org
Thu May 21 15:32:19 UTC 2009


Module: Mesa
Branch: master
Commit: f7ca97f85e73c0b0a0e056ae86e4aa5a68ec39f1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7ca97f85e73c0b0a0e056ae86e4aa5a68ec39f1

Author: Brian Paul <brianp at vmware.com>
Date:   Thu May 14 16:51:10 2009 -0600

mesa: remove pointless null ptr check, improved some error messages

---

 src/mesa/main/bufferobj.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 1f2070e..a806766 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -490,7 +490,7 @@ bind_buffer_object(GLcontext *ctx, GLenum target, GLuint buffer)
    _mesa_reference_buffer_object(ctx, bindTarget, newBufObj);
 
    /* Pass BindBuffer call to device driver */
-   if (ctx->Driver.BindBuffer && newBufObj)
+   if (ctx->Driver.BindBuffer)
       ctx->Driver.BindBuffer( ctx, target, newBufObj );
 }
 
@@ -937,7 +937,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
       return;
    }
    if (bufObj->Name == 0) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB" );
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB(buffer 0)" );
       return;
    }
    
@@ -1025,7 +1025,7 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
       return NULL;
    }
    if (bufObj->Name == 0) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB" );
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(buffer 0)" );
       return NULL;
    }
    if (bufObj->Pointer) {




More information about the mesa-commit mailing list