Mesa (glsl2): ir_constant_expression: Remove open coded equality comparisons.

[Kenneth Graunke]

Module: Mesa
Branch: glsl2
Commit: 3163f87463e6d0123c4f95bd76a658cb1e5d0843
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3163f87463e6d0123c4f95bd76a658cb1e5d0843

Author: Kenneth Graunke <kenn...@whitecape.org>
Date:   Tue Jul 20 03:01:54 2010 -0700

ir_constant_expression: Remove open coded equality comparisons.

The ir_constant::has_value method already does this.

---

 src/glsl/ir_constant_expression.cpp |   40 +---------------------------------
 1 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/src/glsl/ir_constant_expression.cpp 
b/src/glsl/ir_constant_expression.cpp
index cb07f38..b0333db 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -603,46 +603,10 @@ ir_expression::constant_expression_value()
       break;
 
    case ir_binop_equal:
-      data.b[0] = true;
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-        switch (op[0]->type->base_type) {
-        case GLSL_TYPE_UINT:
-           data.b[0] = data.b[0] && op[0]->value.u[c] == op[1]->value.u[c];
-           break;
-        case GLSL_TYPE_INT:
-           data.b[0] = data.b[0] && op[0]->value.i[c] == op[1]->value.i[c];
-           break;
-        case GLSL_TYPE_FLOAT:
-           data.b[0] = data.b[0] && op[0]->value.f[c] == op[1]->value.f[c];
-           break;
-        case GLSL_TYPE_BOOL:
-           data.b[0] = data.b[0] && op[0]->value.b[c] == op[1]->value.b[c];
-           break;
-        default:
-           assert(0);
-        }
-      }
+      data.b[0] = op[0]->has_value(op[1]);
       break;
    case ir_binop_nequal:
-      data.b[0] = false;
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-        switch (op[0]->type->base_type) {
-        case GLSL_TYPE_UINT:
-           data.b[0] = data.b[0] || op[0]->value.u[c] != op[1]->value.u[c];
-           break;
-        case GLSL_TYPE_INT:
-           data.b[0] = data.b[0] || op[0]->value.i[c] != op[1]->value.i[c];
-           break;
-        case GLSL_TYPE_FLOAT:
-           data.b[0] = data.b[0] || op[0]->value.f[c] != op[1]->value.f[c];
-           break;
-        case GLSL_TYPE_BOOL:
-           data.b[0] = data.b[0] || op[0]->value.b[c] != op[1]->value.b[c];
-           break;
-        default:
-           assert(0);
-        }
-      }
+      data.b[0] = !op[0]->has_value(op[1]);
       break;
 
    default:

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit