mesa: return after _mesa_problem() calls
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>
Sat, 13 Sep 2008 20:23:39 +0000 (14:23 -0600)
committerBrian Paul <brian.paul@tungstengraphics.com>
Sat, 13 Sep 2008 20:23:39 +0000 (14:23 -0600)
src/mesa/main/texformat_tmp.h
src/mesa/swrast/s_texfilter.c

index 63939f40111ae3d97d81347ea3ffa92022320430..7499ba7b36ed308b1213a84d288ecc17d270456e 100644 (file)
@@ -1117,6 +1117,7 @@ static void FETCH(ci8)( const struct gl_texture_image *texImage,
          break;;
       default:
          _mesa_problem(ctx, "Bad palette format in fetch_texel_ci8");
+         return;
       }
 #if CHAN_TYPE == GL_UNSIGNED_BYTE
       COPY_4UBV(texel, texelUB);
index c9e9db132f126b76bc2c88e0332bda9c3653629d..ee6131649a66b7fe6761c1a94b5c523b3bd7b93e 100644 (file)
@@ -342,6 +342,7 @@ lerp_rgba_3d(GLchan result[4], GLfloat a, GLfloat b, GLfloat c,
       break;                                                           \
    default:                                                            \
       _mesa_problem(ctx, "Bad wrap mode");                             \
+      return;                                                          \
    }                                                                   \
 }
 
@@ -462,6 +463,7 @@ lerp_rgba_3d(GLchan result[4], GLfloat a, GLfloat b, GLfloat c,
       break;                                                           \
    default:                                                            \
       _mesa_problem(ctx, "Bad wrap mode");                             \
+      return;                                                          \
    }                                                                   \
 }