OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl2: Invoke preprocessor before calling the compiler proper

Browse Source
This commit is contained in:
Ian Romanick
2010-06-29 10:02:36 -07:00
parent 59a23d7fb9
commit 153eca9806
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mesa/shader/ir_to_mesa.cpp
View File

@@ -1526,9 +1526,17 @@ _mesa_get_glsl_shader(GLcontext *ctx, void *mem_ctx, struct gl_shader *sh)
state->loop_or_switch_nesting = NULL; state->loop_or_switch_nesting = NULL;
state->ARB_texture_rectangle_enable = true; state->ARB_texture_rectangle_enable = true;
_mesa_glsl_lexer_ctor(state, shader->Source); /* Create a new context for the preprocessor output. Ultimately, this
_mesa_glsl_parse(state); * should probably be the parser context, but there isn't one yet.
_mesa_glsl_lexer_dtor(state); */
const char *source = shader->Source;
state->error = preprocess(shader, &source, &state->info_log);
if (!state->error) {
_mesa_glsl_lexer_ctor(state, source);
_mesa_glsl_parse(state);
_mesa_glsl_lexer_dtor(state);
}
shader->ir.make_empty(); shader->ir.make_empty();
if (!state->error && !state->translation_unit.is_empty()) if (!state->error && !state->translation_unit.is_empty())