summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-11-12 10:19:08 -0800
committerIan Romanick <ian.d.romanick@intel.com>2010-11-16 12:11:02 -0800
commit38e55153af031e48125b1cd0a5d939bb92379ddc (patch)
tree386166b2f5265da45ca02a12d5034bf3d5cc6aa1
parent4f84a3aa32b06c99e65a4bf91452671075f8204c (diff)
glsl: Refactor is_vec_{zero,one} to be methods of ir_constant
These predicates will be used in other places soon.
-rw-r--r--src/glsl/ir.cpp73
-rw-r--r--src/glsl/ir.h24
-rw-r--r--src/glsl/opt_algebraic.cpp72
3 files changed, 101 insertions, 68 deletions
diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index 87e78eee05..4b886018dc 100644
--- 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 80e0f67d6d..6a70dede9b 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -1441,10 +1441,34 @@ 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.
*
* The field used to back the values supplied by the constant is determined
diff --git a/src/glsl/opt_algebraic.cpp b/src/glsl/opt_algebraic.cpp
index 2ed66db476..c7f5c3b4d6 100644
--- 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