X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fcompiler%2Fglsl%2Fir_array_refcount.h;h=4a9d9017a0214a0f696caac529d7cd036d86e2b9;hb=3719b69dfc496cdacfe857e1a42984c435eb8a6c;hp=2988046aaedbdc9451edf45531d9be5156736e78;hpb=e92935089bd9a987027d1f0791e7298bb3a57113;p=mesa.git

diff --git a/src/compiler/glsl/ir_array_refcount.h b/src/compiler/glsl/ir_array_refcount.h
index 2988046aaed..4a9d9017a02 100644
--- 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,33 +47,11 @@ public:
    /** Has the variable been referenced? */
    bool is_referenced;
 
-   /**
-    * Mark a set of array elements as accessed.
-    *
-    * If every \c array_deref_range is for a single index, only a single
-    * element will be marked.  If any \c array_deref_range is for an entire
-    * array-of-, then multiple elements will be marked.
-    *
-    * Items in the \c array_deref_range list appear in least- to
-    * most-significant order.  This is the \b opposite order the indices
-    * appear in the GLSL shader text.  An array access like
-    *
-    *     x = y[1][i][3];
-    *
-    * would appear as
-    *
-    *     { { 3, n }, { m, m }, { 1, p } }
-    *
-    * where n, m, and p are the sizes of the arrays-of-arrays.
-    *
-    * The set of marked array elements can later be queried by
-    * \c ::is_linearized_index_referenced.
-    *
-    * \param dr     List of array_deref_range elements to be processed.
-    * \param count  Number of array_deref_range elements to be processed.
-    */
-   void mark_array_elements_referenced(const array_deref_range *dr,
-                                       unsigned count);
+   /** 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
@@ -98,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.
@@ -108,27 +71,6 @@ private:
     */
    unsigned num_bits;
 
-   /** Count of nested arrays in the type. */
-   unsigned array_depth;
-
-   /**
-    * Recursive part of the public mark_array_elements_referenced method.
-    *
-    * The recursion occurs when an entire array-of- is accessed.  See the
-    * implementation for more details.
-    *
-    * \param dr                List of array_deref_range elements to be
-    *                          processed.
-    * \param count             Number of array_deref_range elements to be
-    *                          processed.
-    * \param scale             Current offset scale.
-    * \param linearized_index  Current accumulated linearized array index.
-    */
-   void mark_array_elements_referenced(const array_deref_range *dr,
-                                       unsigned count,
-                                       unsigned scale,
-                                       unsigned linearized_index);
-
    friend class array_refcount_test;
 };
 
@@ -140,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
@@ -157,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
     */
@@ -171,3 +123,5 @@ private:
    unsigned derefs_size;
    /*@}*/
 };
+
+#endif /* GLSL_IR_ARRAY_REFCOUNT_H */