diff options
| author | Brian Paul <[email protected]> | 2002-10-30 20:16:43 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2002-10-30 20:16:43 +0000 |
| commit | 4663bd50f1e2f219bd1b2a4d902b11b936512398 (patch) | |
| tree | f7908d9590746d463010be13351647022c24dda8 | |
| parent | 68a7ee5cbbc93c0e746dc843e0fcc1e65ad1baf6 (diff) | |
don't call abort()
| -rw-r--r-- | src/mesa/swrast/s_copypix.c | 7 | ||||
| -rw-r--r-- | src/mesa/swrast/s_triangle.c | 31 |
2 files changed, 24 insertions, 14 deletions
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c index fcab45fe186..31fffff6270 100644 --- a/src/mesa/swrast/s_copypix.c +++ b/src/mesa/swrast/s_copypix.c @@ -1,8 +1,8 @@ -/* $Id: s_copypix.c,v 1.41 2002/10/24 23:57:24 brianp Exp $ */ +/* $Id: s_copypix.c,v 1.42 2002/10/30 20:16:43 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 4.1 + * Version: 5.0 * * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * @@ -414,7 +414,8 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy, } /* convolution */ if (transferOps & IMAGE_CONVOLUTION_BIT) { - abort(); /* should never get here; caught at top of function */ + _mesa_problem(ctx, "Convolution should not be enabled in copy_rgba_pixels()"); + return; } /* GL_POST_CONVOLUTION_RED/GREEN/BLUE/ALPHA_SCALE/BIAS */ if (transferOps & IMAGE_POST_CONVOLUTION_SCALE_BIAS) { diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index 8c340c0b0dd..f96fbe1f2ca 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -1,8 +1,8 @@ -/* $Id: s_triangle.c,v 1.63 2002/10/24 23:57:24 brianp Exp $ */ +/* $Id: s_triangle.c,v 1.64 2002/10/30 20:16:44 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 4.1 + * Version: 5.0 * * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * @@ -477,7 +477,8 @@ affine_span(GLcontext *ctx, struct sw_span *span, SPAN_NEAREST(NEAREST_RGB;ADD,3); break; default: - abort(); + _mesa_problem(ctx, "bad tex env mode in SPAN_LINEAR"); + return; } break; case GL_RGBA: @@ -498,7 +499,8 @@ affine_span(GLcontext *ctx, struct sw_span *span, SPAN_NEAREST(NEAREST_RGBA_REPLACE,4); break; default: - abort(); + _mesa_problem(ctx, "bad tex env mode (2) in SPAN_LINEAR"); + return; } break; } @@ -524,7 +526,8 @@ affine_span(GLcontext *ctx, struct sw_span *span, SPAN_LINEAR(LINEAR_RGB;ADD,3); break; default: - abort(); + _mesa_problem(ctx, "bad tex env mode (3) in SPAN_LINEAR"); + return; } break; case GL_RGBA: @@ -545,8 +548,10 @@ affine_span(GLcontext *ctx, struct sw_span *span, SPAN_LINEAR(LINEAR_RGBA;REPLACE,4); break; default: - abort(); - } break; + _mesa_problem(ctx, "bad tex env mode (4) in SPAN_LINEAR"); + return; + } + break; } break; } @@ -750,7 +755,8 @@ fast_persp_span(GLcontext *ctx, struct sw_span *span, SPAN_NEAREST(NEAREST_RGB;ADD,3); break; default: - abort(); + _mesa_problem(ctx, "bad tex env mode (5) in SPAN_LINEAR"); + return; } break; case GL_RGBA: @@ -771,7 +777,8 @@ fast_persp_span(GLcontext *ctx, struct sw_span *span, SPAN_NEAREST(NEAREST_RGBA_REPLACE,4); break; default: - abort(); + _mesa_problem(ctx, "bad tex env mode (6) in SPAN_LINEAR"); + return; } break; } @@ -795,7 +802,8 @@ fast_persp_span(GLcontext *ctx, struct sw_span *span, SPAN_LINEAR(LINEAR_RGB;ADD,3); break; default: - abort(); + _mesa_problem(ctx, "bad tex env mode (7) in SPAN_LINEAR"); + return; } break; case GL_RGBA: @@ -816,7 +824,8 @@ fast_persp_span(GLcontext *ctx, struct sw_span *span, SPAN_LINEAR(LINEAR_RGBA;REPLACE,4); break; default: - abort(); + _mesa_problem(ctx, "bad tex env mode (8) in SPAN_LINEAR"); + return; } break; } |