Merge branch 'mesa'

This brings in the ir_to_mesa.cpp code I've been developing to codegen
to the Mesa IR.  It does not actually generate a complete Mesa
fragment/vertex program yet.

1 files changed, 9 insertions, 3 deletions

diff --git a/ir.h b/ir.h
index 1c95512fb1..3d2c7ff5cf 100644
--- a/ir.h
+++ b/ir.h
@@ -37,6 +37,10 @@ extern "C" {
 #include "ir_visitor.h"
 #include "ir_hierarchical_visitor.h"
 
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
+#endif
+
 struct ir_program {
    void *bong_hits;
 };
@@ -758,9 +762,9 @@ public:
    };
 
    ir_loop_jump(jump_mode mode)
-      : mode(mode)
    {
-      /* empty */
+      this->mode = mode;
+      this->loop = loop;
    }
 
    virtual ir_instruction *clone(struct hash_table *) const;
@@ -782,9 +786,11 @@ public:
       return mode == jump_continue;
    }
 
-private:
    /** Mode selector for the jump instruction. */
    enum jump_mode mode;
+private:
+   /** Loop containing this break instruction. */
+   ir_loop *loop;
 };
 /*@}*/