nir: Allow var_mem_global in nir_lower_vars_to_explicit_types

[mesa.git] / src / compiler / glsl / ir_array_refcount.h

diff --git a/src/compiler/glsl/ir_array_refcount.h b/src/compiler/glsl/ir_array_refcount.h
index 1e7f34349f81b9a521af463e82123903d44642a9..4a9d9017a0214a0f696caac529d7cd036d86e2b9 100644 (file)
--- a/src/compiler/glsl/ir_array_refcount.h
+++ b/src/compiler/glsl/ir_array_refcount.h
@@ -27,28 +27,15 @@
  * Provides a visitor which produces a list of variables referenced.
  */
 
+#ifndef GLSL_IR_ARRAY_REFCOUNT_H
+#define GLSL_IR_ARRAY_REFCOUNT_H
+
 #include "ir.h"
 #include "ir_visitor.h"
+#include "linker_util.h"
 #include "compiler/glsl_types.h"
 #include "util/bitset.h"
 
-/**
- * Describes an access of an array element or an access of the whole array
- */
-struct array_deref_range {
-   /**
-    * Index that was accessed.
-    *
-    * All valid array indices are less than the size of the array.  If index
-    * is equal to the size of the array, this means the entire array has been
-    * accessed (e.g., due to use of a non-constant index).
-    */
-   unsigned index;
-
-   /** Size of the array.  Used for offset calculations. */
-   unsigned size;
-};
-
 class ir_array_refcount_entry
 {
 public:
@@ -60,6 +47,12 @@ public:
    /** Has the variable been referenced? */
    bool is_referenced;
 
+   /** Count of nested arrays in the type. */
+   unsigned array_depth;
+
+   /** Set of bit-flags to note which array elements have been accessed. */
+   BITSET_WORD *bits;
+
    /** Has a linearized array index been referenced? */
    bool is_linearized_index_referenced(unsigned linearized_index) const
    {
@@ -70,8 +63,6 @@ public:
    }
 
 private:
-   /** Set of bit-flags to note which array elements have been accessed. */
-   BITSET_WORD *bits;
 
    /**
     * Total number of bits referenced by \c bits.
@@ -91,6 +82,7 @@ public:
    virtual ir_visitor_status visit(ir_dereference_variable *);
 
    virtual ir_visitor_status visit_enter(ir_function_signature *);
+   virtual ir_visitor_status visit_enter(ir_dereference_array *);
 
    /**
     * Find variable in the hash table, and insert it if not present
@@ -108,6 +100,15 @@ private:
    /** Get an array_deref_range element from private tracking. */
    array_deref_range *get_array_deref();
 
+   /**
+    * Last ir_dereference_array that was visited
+    *
+    * Used to prevent some redundant calculations.
+    *
+    * \sa ::visit_enter(ir_dereference_array *)
+    */
+   ir_dereference_array *last_array_deref;
+
    /**
     * \name array_deref_range tracking
     */
@@ -122,3 +123,5 @@ private:
    unsigned derefs_size;
    /*@}*/
 };
+
+#endif /* GLSL_IR_ARRAY_REFCOUNT_H */