diff options
| author | Brian Paul <[email protected]> | 2001-02-13 23:51:34 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2001-02-13 23:51:34 +0000 |
| commit | dc866313affb0b4f2073f1234f69a4804f02c7a7 (patch) | |
| tree | 009c976f3e55d66661badb9cc57c2c8d75c5152c /src | |
| parent | 8f28f4850bbf4f32e84f25ee1a8d72b16b8a41d1 (diff) | |
gl_error clean-ups
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/enable.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/matrix.c | 4 | ||||
| -rw-r--r-- | src/mesa/tnl/t_imm_dlist.c | 3 | ||||
| -rw-r--r-- | src/mesa/tnl/t_imm_fixup.c | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index dad03c356aa..37ada84a7df 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -1,4 +1,4 @@ -/* $Id: enable.c,v 1.40 2001/01/23 23:39:36 brianp Exp $ */ +/* $Id: enable.c,v 1.41 2001/02/13 23:51:34 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -239,7 +239,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) break; case GL_HISTOGRAM: if (!ctx->Extensions.EXT_histogram) { - gl_error(ctx, GL_INVALID_ENUM, "enable GL_HISTOGRAM"); + gl_error(ctx, GL_INVALID_ENUM, "glEnable(GL_HISTOGRAM)"); return; } if (ctx->Pixel.HistogramEnabled == state) diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c index 241898c20af..1239f6e2e84 100644 --- a/src/mesa/main/matrix.c +++ b/src/mesa/main/matrix.c @@ -1,4 +1,4 @@ -/* $Id: matrix.c,v 1.31 2001/02/05 18:48:52 brianp Exp $ */ +/* $Id: matrix.c,v 1.32 2001/02/13 23:51:34 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -123,7 +123,7 @@ _mesa_Ortho( GLdouble left, GLdouble right, bottom == top || nearval == farval) { - gl_error( ctx, GL_INVALID_VALUE, "gl_Ortho" ); + gl_error( ctx, GL_INVALID_VALUE, "glOrtho" ); return; } diff --git a/src/mesa/tnl/t_imm_dlist.c b/src/mesa/tnl/t_imm_dlist.c index 3e1a9e266f6..3cd08ba4c11 100644 --- a/src/mesa/tnl/t_imm_dlist.c +++ b/src/mesa/tnl/t_imm_dlist.c @@ -1,4 +1,4 @@ -/* $Id: t_imm_dlist.c,v 1.6 2001/01/29 20:47:39 keithw Exp $ */ +/* $Id: t_imm_dlist.c,v 1.7 2001/02/13 23:51:34 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -227,6 +227,7 @@ execute_compiled_cassette( GLcontext *ctx, void *data ) if (ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1) tnl->ReplayHardBeginEnd = 1; if (!tnl->ReplayHardBeginEnd) { + /* XXX is this really an OpenGL error or an implementation problem? */ gl_error(ctx, GL_INVALID_OPERATION, "hard replay"); return; } diff --git a/src/mesa/tnl/t_imm_fixup.c b/src/mesa/tnl/t_imm_fixup.c index dc45799bb27..54fd6670b1d 100644 --- a/src/mesa/tnl/t_imm_fixup.c +++ b/src/mesa/tnl/t_imm_fixup.c @@ -1,4 +1,4 @@ -/* $Id: t_imm_fixup.c,v 1.5 2001/02/06 21:42:49 brianp Exp $ */ +/* $Id: t_imm_fixup.c,v 1.6 2001/02/13 23:51:34 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -572,7 +572,7 @@ void _tnl_fixup_compiled_cassette( GLcontext *ctx, struct immediate *IM ) GLuint i; if (IM->BeginState & VERT_ERROR_1) - gl_error( ctx, GL_INVALID_OPERATION, "begin/end"); + gl_error( ctx, GL_INVALID_OPERATION, "glBegin/glEnd"); for (i = IM->Start ; i <= IM->Count ; i += IM->PrimitiveLength[i]) if (IM->Flag[i] & (VERT_BEGIN|VERT_END_VB)) @@ -596,7 +596,7 @@ void _tnl_fixup_compiled_cassette( GLcontext *ctx, struct immediate *IM ) GLuint i; if (IM->BeginState & VERT_ERROR_0) - gl_error( ctx, GL_INVALID_OPERATION, "begin/end"); + gl_error( ctx, GL_INVALID_OPERATION, "glBegin/glEnd"); if (IM->CopyStart == IM->Start && IM->Flag[IM->Start] & (VERT_END|VERT_END_VB)) |