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, 1 insertions, 1 deletions

diff --git a/program.h b/program.h
index 5c900b53cc..d21b04344c 100644
--- a/program.h
+++ b/program.h
@@ -22,6 +22,7 @@
  */
 
 #include <GL/gl.h>
+#include "main/mtypes.h"
 
 /**
  * Based on gl_shader in Mesa's mtypes.h.
@@ -41,7 +42,6 @@ struct glsl_shader {
 };
 
 
-typedef int gl_register_file;
 typedef int gl_state_index;
 #define STATE_LENGTH 5