diff options
| author | Eric Anholt <eric@anholt.net> | 2010-06-25 12:37:21 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-06-25 12:37:21 -0700 |
| commit | 364fcd8ee1af39e215338fba59306a14dd81c2b2 (patch) | |
| tree | f8cac6a8a903645ae72fc506b0c1ee00a2778945 /src/glsl/program.h | |
| parent | 7f2bf62d25b2fdc059163ee046cf2fe007e5041e (diff) | |
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.
Diffstat (limited to 'src/glsl/program.h')
| -rw-r--r-- | src/glsl/program.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/glsl/program.h b/src/glsl/program.h index 3c656e9e7c..fd8197a45a 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; }; /** |