Mesa (master): mesa: Remove "APPLE" from some VAO error messages.

Kenneth Graunke kwg at kemper.freedesktop.org
Mon Feb 3 09:03:32 UTC 2014


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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Sat Feb  1 21:25:42 2014 -0800

mesa: Remove "APPLE" from some VAO error messages.

Chances are, people will be using the core names these days.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

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

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 0b9592f..acb1bf7 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -480,7 +480,7 @@ _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids)
    GLsizei i;
 
    if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteVertexArrayAPPLE(n)");
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteVertexArray(n)");
       return;
    }
 
@@ -524,7 +524,7 @@ gen_vertex_arrays(struct gl_context *ctx, GLsizei n, GLuint *arrays)
    GLint i;
 
    if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGenVertexArraysAPPLE");
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenVertexArrays");
       return;
    }
 
@@ -541,7 +541,7 @@ gen_vertex_arrays(struct gl_context *ctx, GLsizei n, GLuint *arrays)
 
       obj = (*ctx->Driver.NewArrayObject)( ctx, name );
       if (!obj) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenVertexArraysAPPLE");
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenVertexArrays");
          return;
       }
       save_array_object(ctx, obj);




More information about the mesa-commit mailing list