glsl: Refactor is_vec_{zero,one} to be methods of ir_constant

These predicates will be used in other places soon.

diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index 87e78eee0561f4387bf817741432ff09d86da63e..4b886018dcab89f1fa4299c5a9def5f6c5e6e0a7 100644 (file)
--- a/src/glsl/ir.cpp
+++ b/src/glsl/ir.cpp
@@ -742,6 +742,79 @@ ir_constant::has_value(const ir_constant *c) const
    return true;
 }
 
+bool
+ir_constant::is_zero() const
+{
+   if (!this->type->is_scalar() && !this->type->is_vector())
+      return false;
+
+   for (unsigned c = 0; c < this->type->vector_elements; c++) {
+      switch (this->type->base_type) {
+      case GLSL_TYPE_FLOAT:
+        if (this->value.f[c] != 0.0)
+           return false;
+        break;
+      case GLSL_TYPE_INT:
+        if (this->value.i[c] != 0)
+           return false;
+        break;
+      case GLSL_TYPE_UINT:
+        if (this->value.u[c] != 0)
+           return false;
+        break;
+      case GLSL_TYPE_BOOL:
+        if (this->value.b[c] != false)
+           return false;
+        break;
+      default:
+        /* The only other base types are structures, arrays, and samplers.
+         * Samplers cannot be constants, and the others should have been
+         * filtered out above.
+         */
+        assert(!"Should not get here.");
+        return false;
+      }
+   }
+
+   return true;
+}
+
+bool
+ir_constant::is_one() const
+{
+   if (!this->type->is_scalar() && !this->type->is_vector())
+      return false;
+
+   for (unsigned c = 0; c < this->type->vector_elements; c++) {
+      switch (this->type->base_type) {
+      case GLSL_TYPE_FLOAT:
+        if (this->value.f[c] != 1.0)
+           return false;
+        break;
+      case GLSL_TYPE_INT:
+        if (this->value.i[c] != 1)
+           return false;
+        break;
+      case GLSL_TYPE_UINT:
+        if (this->value.u[c] != 1)
+           return false;
+        break;
+      case GLSL_TYPE_BOOL:
+        if (this->value.b[c] != true)
+           return false;
+        break;
+      default:
+        /* The only other base types are structures, arrays, and samplers.
+         * Samplers cannot be constants, and the others should have been
+         * filtered out above.
+         */
+        assert(!"Should not get here.");
+        return false;
+      }
+   }
+
+   return true;
+}
 
 ir_loop::ir_loop()
 {

diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index 80e0f67d6d82624468f4aa27abdb1101c9028959..6a70dede9b28713076b663f00bf655de98a6de4c 100644 (file)
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -1441,9 +1441,33 @@ public:
 
    /**
     * Determine whether a constant has the same value as another constant
+    *
+    * \sa ir_constant::is_zero, ir_constant::is_one
     */
    bool has_value(const ir_constant *) const;
 
+   /**
+    * Determine if a constant has the value zero
+    *
+    * \note
+    * This function always returns \c false for constants that are not
+    * scalars or vectors.
+    *
+    * \sa ir_constant::has_value, ir_constant::is_one
+    */
+   bool is_zero() const;
+
+   /**
+    * Determine if a constant has the value one
+    *
+    * \note
+    * This function always returns \c false for constants that are not
+    * scalars or vectors.
+    *
+    * \sa ir_constant::has_value, ir_constant::is_zero
+    */
+   bool is_one() const;
+
    /**
     * Value of the constant.
     *

diff --git a/src/glsl/opt_algebraic.cpp b/src/glsl/opt_algebraic.cpp
index 2ed66db476578a431115c48a8d0ef33c3ab48fba..c7f5c3b4d639fcc777cdfb276733a56e38651a7f 100644 (file)
--- a/src/glsl/opt_algebraic.cpp
+++ b/src/glsl/opt_algebraic.cpp
@@ -68,80 +68,16 @@ public:
    bool progress;
 };
 
-static bool
+static inline bool
 is_vec_zero(ir_constant *ir)
 {
-   int c;
-
-   if (!ir)
-      return false;
-   if (!ir->type->is_scalar() &&
-       !ir->type->is_vector())
-      return false;
-
-   for (c = 0; c < ir->type->vector_elements; c++) {
-      switch (ir->type->base_type) {
-      case GLSL_TYPE_FLOAT:
-        if (ir->value.f[c] != 0.0)
-           return false;
-        break;
-      case GLSL_TYPE_INT:
-        if (ir->value.i[c] != 0)
-           return false;
-        break;
-      case GLSL_TYPE_UINT:
-        if (ir->value.u[c] != 0)
-           return false;
-        break;
-      case GLSL_TYPE_BOOL:
-        if (ir->value.b[c] != false)
-           return false;
-        break;
-      default:
-        assert(!"bad base type");
-        return false;
-      }
-   }
-
-   return true;
+   return (ir == NULL) ? false : ir->is_zero();
 }
 
-static bool
+static inline bool
 is_vec_one(ir_constant *ir)
 {
-   int c;
-
-   if (!ir)
-      return false;
-   if (!ir->type->is_scalar() &&
-       !ir->type->is_vector())
-      return false;
-
-   for (c = 0; c < ir->type->vector_elements; c++) {
-      switch (ir->type->base_type) {
-      case GLSL_TYPE_FLOAT:
-        if (ir->value.f[c] != 1.0)
-           return false;
-        break;
-      case GLSL_TYPE_INT:
-        if (ir->value.i[c] != 1)
-           return false;
-        break;
-      case GLSL_TYPE_UINT:
-        if (ir->value.u[c] != 1)
-           return false;
-        break;
-      case GLSL_TYPE_BOOL:
-        if (ir->value.b[c] != true)
-           return false;
-        break;
-      default:
-        assert(!"bad base type");
-        return false;
-      }
-   }
-
-   return true;
+   return (ir == NULL) ? false : ir->is_one();
 }
 
 static void