summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Melquiond <[email protected]>2008-09-13 14:23:39 -0600
committerBrian Paul <[email protected]>2008-09-13 14:23:39 -0600
commit11a889db8f182fb1d11c998e5156deac8ca9f91d (patch)
tree1076d0bff6438c7db70b471d5af4ecacfb5d7aeb /src
parentd2e0504d4e1d00bfc59d6661f9f0d33db1768f42 (diff)
mesa: return after _mesa_problem() calls
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/texformat_tmp.h1
-rw-r--r--src/mesa/swrast/s_texfilter.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index 63939f40111..7499ba7b36e 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -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);
diff --git a/src/mesa/swrast/s_texfilter.c b/src/mesa/swrast/s_texfilter.c
index c9e9db132f1..ee6131649a6 100644
--- a/src/mesa/swrast/s_texfilter.c
+++ b/src/mesa/swrast/s_texfilter.c
@@ -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; \
} \
}