Mesa (master): mesa: minor error string changes

Brian Paul brianp at kemper.freedesktop.org
Fri Aug 14 17:31:39 UTC 2009


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

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Aug 14 10:41:03 2009 -0600

mesa: minor error string changes

---

 src/mesa/main/api_validate.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 33f4dd1..0c6d9af 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -100,11 +100,11 @@ max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
  * Check if OK to render by examining framebuffer status and vertex arrays.
  */
 static GLboolean
-check_valid_to_render(GLcontext *ctx, char *function)
+check_valid_to_render(GLcontext *ctx, const char *function)
 {
    if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
       _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                  "glDraw%s(incomplete framebuffer)", function);
+                  "%s(incomplete framebuffer)", function);
       return GL_FALSE;
    }
 
@@ -161,7 +161,7 @@ _mesa_validate_DrawElements(GLcontext *ctx,
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
-   if (!check_valid_to_render(ctx, "Elements"))
+   if (!check_valid_to_render(ctx, "glDrawElements"))
       return GL_FALSE;
 
    /* Vertex buffer object tests */
@@ -234,7 +234,7 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
-   if (!check_valid_to_render(ctx, "RangeElements"))
+   if (!check_valid_to_render(ctx, "glDrawRangeElements"))
       return GL_FALSE;
 
    /* Vertex buffer object tests */
@@ -290,7 +290,7 @@ _mesa_validate_DrawArrays(GLcontext *ctx,
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
-   if (!check_valid_to_render(ctx, "Arrays"))
+   if (!check_valid_to_render(ctx, "glDrawArrays"))
       return GL_FALSE;
 
    if (ctx->Const.CheckArrayBounds) {




More information about the mesa-commit mailing list