summaryrefslogtreecommitdiff
path: root/glsl_parser_extras.cpp
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-06-08 22:33:43 -0700
committerKenneth Graunke <kenneth@whitecape.org>2010-06-09 11:14:58 -0700
commit57503a22d767c146862b5e2ac0e07f8a8f5193df (patch)
treeaf5220a3bd53a901f661d2bb21fd3faba9915882 /glsl_parser_extras.cpp
parent4b0029a97d564679becb4bbf243dadb8b8b87c0a (diff)
Only initialize types after #extension directives have been processed.
Since _mesa_glsl_initialize_types add types for various extensions, we can't call it until after processing "#extension foo : disable" lines. Fixes tex_rect_02.frag.
Diffstat (limited to 'glsl_parser_extras.cpp')
-rw-r--r--glsl_parser_extras.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/glsl_parser_extras.cpp b/glsl_parser_extras.cpp
index f6b3028..3c89594 100644
--- a/glsl_parser_extras.cpp
+++ b/glsl_parser_extras.cpp
@@ -737,7 +737,7 @@ main(int argc, char **argv)
ast->print();
}
- if (!state.translation_unit.is_empty())
+ if (!state.error && !state.translation_unit.is_empty())
_mesa_ast_to_hir(&instructions, &state);
} else {
/* FINISHME: We should initialize this to the max GLSL version supported