nir/spirv: Array lengths are constants not literals

[mesa.git] / src / glsl / ir_equals.cpp

diff --git a/src/glsl/ir_equals.cpp b/src/glsl/ir_equals.cpp
index 65376cd943bb20e41c9c88b3492bf61c99642020..b86f4ea16bb1545b08df585aff0ebf1accfad8e2 100644 (file)
--- a/src/glsl/ir_equals.cpp
+++ b/src/glsl/ir_equals.cpp
@@ -28,7 +28,8 @@
  * can't access a's vtable in that case.
  */
 static bool
-possibly_null_equals(ir_instruction *a, ir_instruction *b, enum ir_node_type ignore)
+possibly_null_equals(const ir_instruction *a, const ir_instruction *b,
+                     enum ir_node_type ignore)
 {
    if (!a || !b)
       return !a && !b;
@@ -41,13 +42,13 @@ possibly_null_equals(ir_instruction *a, ir_instruction *b, enum ir_node_type ign
  * about.
  */
 bool
-ir_instruction::equals(ir_instruction *, enum ir_node_type)
+ir_instruction::equals(const ir_instruction *, enum ir_node_type) const
 {
    return false;
 }
 
 bool
-ir_constant::equals(ir_instruction *ir, enum ir_node_type)
+ir_constant::equals(const ir_instruction *ir, enum ir_node_type) const
 {
    const ir_constant *other = ir->as_constant();
    if (!other)
@@ -57,15 +58,21 @@ ir_constant::equals(ir_instruction *ir, enum ir_node_type)
       return false;
 
    for (unsigned i = 0; i < type->components(); i++) {
-      if (value.u[i] != other->value.u[i])
-         return false;
+      if (type->base_type == GLSL_TYPE_DOUBLE) {
+         if (value.d[i] != other->value.d[i])
+            return false;
+      } else {
+         if (value.u[i] != other->value.u[i])
+            return false;
+      }
    }
 
    return true;
 }
 
 bool
-ir_dereference_variable::equals(ir_instruction *ir, enum ir_node_type)
+ir_dereference_variable::equals(const ir_instruction *ir,
+                                enum ir_node_type) const
 {
    const ir_dereference_variable *other = ir->as_dereference_variable();
    if (!other)
@@ -75,7 +82,8 @@ ir_dereference_variable::equals(ir_instruction *ir, enum ir_node_type)
 }
 
 bool
-ir_dereference_array::equals(ir_instruction *ir, enum ir_node_type ignore)
+ir_dereference_array::equals(const ir_instruction *ir,
+                             enum ir_node_type ignore) const
 {
    const ir_dereference_array *other = ir->as_dereference_array();
    if (!other)
@@ -94,7 +102,8 @@ ir_dereference_array::equals(ir_instruction *ir, enum ir_node_type ignore)
 }
 
 bool
-ir_swizzle::equals(ir_instruction *ir, enum ir_node_type ignore)
+ir_swizzle::equals(const ir_instruction *ir,
+                   enum ir_node_type ignore) const
 {
    const ir_swizzle *other = ir->as_swizzle();
    if (!other)
@@ -116,7 +125,7 @@ ir_swizzle::equals(ir_instruction *ir, enum ir_node_type ignore)
 }
 
 bool
-ir_texture::equals(ir_instruction *ir, enum ir_node_type ignore)
+ir_texture::equals(const ir_instruction *ir, enum ir_node_type ignore) const
 {
    const ir_texture *other = ir->as_texture();
    if (!other)
@@ -147,6 +156,8 @@ ir_texture::equals(ir_instruction *ir, enum ir_node_type ignore)
    case ir_tex:
    case ir_lod:
    case ir_query_levels:
+   case ir_texture_samples:
+   case ir_samples_identical:
       break;
    case ir_txb:
       if (!lod_info.bias->equals(other->lod_info.bias, ignore))
@@ -179,7 +190,7 @@ ir_texture::equals(ir_instruction *ir, enum ir_node_type ignore)
 }
 
 bool
-ir_expression::equals(ir_instruction *ir, enum ir_node_type ignore)
+ir_expression::equals(const ir_instruction *ir, enum ir_node_type ignore) const
 {
    const ir_expression *other = ir->as_expression();
    if (!other)