summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Vesely <[email protected]>2015-01-14 15:53:18 -0500
committerJosé Fonseca <[email protected]>2015-01-21 14:05:04 +0000
commitda1f92779d0b65c4a57ea201cca6d370da63a011 (patch)
tree398faa1ae8fcb6a40d7adf6d06d4a9df9725b545
parent194f6235b32cd0c54547a3913e463cf691d011d6 (diff)
mesa: remove comparisons that are always true
Signed-off-by: Jan Vesely <[email protected]> Reviewed-by: Jose Fonseca <[email protected]>
-rw-r--r--src/mesa/program/prog_execute.c1
-rw-r--r--src/mesa/program/prog_statevars.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/src/mesa/program/prog_execute.c b/src/mesa/program/prog_execute.c
index 33c1751e810..85aba0013d0 100644
--- a/src/mesa/program/prog_execute.c
+++ b/src/mesa/program/prog_execute.c
@@ -1260,7 +1260,6 @@ _mesa_execute_program(struct gl_context * ctx,
else if (swz == SWIZZLE_ONE)
result[i] = 1.0;
else {
- ASSERT(swz >= 0);
ASSERT(swz <= 3);
result[i] = src[swz];
}
diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c
index be5ddb106b0..7f5daf8c676 100644
--- a/src/mesa/program/prog_statevars.c
+++ b/src/mesa/program/prog_statevars.c
@@ -295,9 +295,7 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[],
const gl_state_index modifier = state[4];
const GLfloat *m;
GLuint row, i;
- ASSERT(firstRow >= 0);
ASSERT(firstRow < 4);
- ASSERT(lastRow >= 0);
ASSERT(lastRow < 4);
if (mat == STATE_MODELVIEW_MATRIX) {
matrix = ctx->ModelviewMatrixStack.Top;