svn merge ^/branches/released .

1 files changed, 26 insertions, 0 deletions

diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h
index 72e3e35c4..6292bec1b 100644
--- a/mesalib/src/glsl/ir.h
+++ b/mesalib/src/glsl/ir.h
@@ -253,6 +253,16 @@ enum ir_depth_layout {
 const char*

 depth_layout_string(ir_depth_layout layout);

 

+/**

+ * Description of built-in state associated with a uniform

+ *

+ * \sa ir_variable::state_slots

+ */

+struct ir_state_slot {

+   int tokens[5];

+   int swizzle;

+};

+

 class ir_variable : public ir_instruction {

 public:

    ir_variable(const struct glsl_type *, const char *, ir_variable_mode);

@@ -386,6 +396,22 @@ public:
    int location;

 

    /**

+    * Built-in state that backs this uniform

+    *

+    * Once set at variable creation, \c state_slots must remain invariant.

+    * This is because, ideally, this array would be shared by all clones of

+    * this variable in the IR tree.  In other words, we'd really like for it

+    * to be a fly-weight.

+    *

+    * If the variable is not a uniform, \c num_state_slots will be zero and

+    * \c state_slots will be \c NULL.

+    */

+   /*@{*/

+   unsigned num_state_slots;    /**< Number of state slots used */

+   ir_state_slot *state_slots;  /**< State descriptors. */

+   /*@}*/

+

+   /**

     * Emit a warning if this variable is accessed.

     */

    const char *warn_extension;