Mesa (master): mesa: Use "non-gen name" more consistently as an error message in GL core.

Eric Anholt anholt at kemper.freedesktop.org
Sun Nov 4 20:34:55 UTC 2012


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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Oct 31 15:37:59 2012 -0700

mesa: Use "non-gen name" more consistently as an error message in GL core.

I used this to help verify that my test was actually testing the paths I
wanted to.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/main/arrayobj.c |    2 +-
 src/mesa/main/texobj.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 5959260..926c753 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -359,7 +359,7 @@ bind_vertex_array(struct gl_context *ctx, GLuint id, GLboolean genRequired)
       newObj = lookup_arrayobj(ctx, id);
       if (!newObj) {
          if (genRequired) {
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glBindVertexArray(id)");
+            _mesa_error(ctx, GL_INVALID_OPERATION, "glBindVertexArray(non-gen name)");
             return;
          }
 
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 224d8a8..8525ff9 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1220,7 +1220,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
       }
       else {
          if (ctx->API == API_OPENGL_CORE) {
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glBindTexture");
+            _mesa_error(ctx, GL_INVALID_OPERATION, "glBindTexture(non-gen name)");
             return;
          }
 




More information about the mesa-commit mailing list