From: Jan Vesely <jan.vesely@rutgers.edu>
Date: Wed, 14 Jan 2015 20:53:18 +0000 (-0500)
Subject: mesa: remove comparisons that are always true
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=da1f92779d0b65c4a57ea201cca6d370da63a011;p=mesa.git

mesa: remove comparisons that are always true

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
---

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;