mesa: Rearrange legal_texobj_target to look more like _mesa_legal_get_tex_level_param...

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

diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c
index 75f9d74bc8893d751c93d03aa15c1894d2de339c..46c6036d2a50ce9ff5988f7805f439e6d9fbc4a9 100644 (file)
--- a/src/mesa/main/condrender.c
+++ b/src/mesa/main/condrender.c
@@ -55,7 +55,7 @@ _mesa_BeginConditionalRender(GLuint queryId, GLenum mode)
       return;
    }
 
-   ASSERT(ctx->Query.CondRenderMode == GL_NONE);
+   assert(ctx->Query.CondRenderMode == GL_NONE);
 
    /* Section 2.14 (Conditional Rendering) of the OpenGL 3.0 spec says:
     *
@@ -70,7 +70,7 @@ _mesa_BeginConditionalRender(GLuint queryId, GLenum mode)
                   "glBeginConditionalRender(bad queryId=%u)", queryId);
       return;
    }
-   ASSERT(q->Id == queryId);
+   assert(q->Id == queryId);
 
    switch (mode) {
    case GL_QUERY_WAIT:
@@ -87,7 +87,7 @@ _mesa_BeginConditionalRender(GLuint queryId, GLenum mode)
       /* fallthrough - invalid */
    default:
       _mesa_error(ctx, GL_INVALID_ENUM, "glBeginConditionalRender(mode=%s)",
-                  _mesa_lookup_enum_by_nr(mode));
+                  _mesa_enum_to_string(mode));
       return;
    }
 
@@ -184,7 +184,7 @@ _mesa_check_conditional_render(struct gl_context *ctx)
    default:
       _mesa_problem(ctx, "Bad cond render mode %s in "
                     " _mesa_check_conditional_render()",
-                    _mesa_lookup_enum_by_nr(ctx->Query.CondRenderMode));
+                    _mesa_enum_to_string(ctx->Query.CondRenderMode));
       return GL_TRUE;
    }
 }