glsl2: Start integrating ir_to_mesa.cpp into shader_api.h

The compiler is now called by the driver, and generates program
instructions.  Parameter lists are still not set up, so the driver
chokes on it shortly thereafter.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/glsl/program.h b/src/glsl/program.h
index 3c656e9e7c3..fd8197a45a6 100644
--- a/src/glsl/program.h
+++ b/src/glsl/program.h
@@ -23,8 +23,11 @@
 
 #include <GL/gl.h>
 #include "main/mtypes.h"
+
+extern "C" {
 #include "shader/prog_parameter.h"
 #include "shader/prog_uniform.h"
+}
 
 /**
  * Based on gl_shader in Mesa's mtypes.h.
@@ -41,6 +44,7 @@ struct glsl_shader {
 
    struct exec_list ir;
    struct glsl_symbol_table *symbols;
+   struct gl_shader *mesa_shader;
 };
 
 /**