Mesa (master): glsl: Fix tautological comparison.

Matt Turner mattst88 at kemper.freedesktop.org
Mon Nov 24 22:12:35 UTC 2014


Module: Mesa
Branch: master
Commit: b754e525325d6a04d2c43372cd359486ff69b812
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b754e525325d6a04d2c43372cd359486ff69b812

Author: Matt Turner <mattst88 at gmail.com>
Date:   Fri Nov 21 14:53:20 2014 -0800

glsl: Fix tautological comparison.

Caught by clang.

warning: comparison of constant -1 with expression of type
         'ir_texture_opcode' is always false
      [-Wtautological-constant-out-of-range-compare]
      if (op == -1)
          ~~ ^  ~~

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/glsl/ir_reader.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp
index ae00e79..fd318c0 100644
--- a/src/glsl/ir_reader.cpp
+++ b/src/glsl/ir_reader.cpp
@@ -972,7 +972,7 @@ ir_reader::read_texture(s_expression *expr)
       op = ir_query_levels;
    } else if (MATCH(expr, other_pattern)) {
       op = ir_texture::get_opcode(tag->value());
-      if (op == -1)
+      if (op == (ir_texture_opcode) -1)
 	 return NULL;
    } else {
       ir_read_error(NULL, "unexpected texture pattern %s", tag->value());




More information about the mesa-commit mailing list