diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-08-16 09:30:14 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-08-16 09:30:14 -0600 |
| commit | 1f4997c2aaf424c8a12cc6fdb1dd994f66074a1d (patch) | |
| tree | de14cfe88863d678bc618b54a7569f831fd7f590 /src/mesa/shader/slang/slang_preprocess.c | |
| parent | 1b39b92e6d7d3a7e6c39b985ffff32a79a510333 (diff) | |
mesa: import latest GLSL code from gallium-0.1 branch
Diffstat (limited to 'src/mesa/shader/slang/slang_preprocess.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_preprocess.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/shader/slang/slang_preprocess.c b/src/mesa/shader/slang/slang_preprocess.c index d3f412c211..786f6467c9 100644 --- a/src/mesa/shader/slang/slang_preprocess.c +++ b/src/mesa/shader/slang/slang_preprocess.c @@ -28,7 +28,7 @@ * \author Michal Krol */ -#include "imports.h" +#include "main/imports.h" #include "shader/grammar/grammar_mesa.h" #include "slang_preprocess.h" @@ -537,7 +537,11 @@ pp_state_init (pp_state *self, slang_info_log *elog) { self->line = 0; self->file = 1; +#if FEATURE_es2_glsl + self->version = 100; +#else self->version = 110; +#endif pp_symbols_init (&self->symbols); pp_ext_init (&self->ext); self->elog = elog; |