diff options
| -rw-r--r-- | src/glsl/ast_to_hir.cpp | 15 | ||||
| -rw-r--r-- | src/glsl/glsl_parser_extras.h | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 4f328ad8f46..c580359fdd0 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -3537,6 +3537,7 @@ ast_switch_statement::hir(exec_list *instructions, state->switch_state.switch_nesting_ast = this; state->switch_state.labels_ht = hash_table_ctor(0, hash_table_pointer_hash, hash_table_pointer_compare); + state->switch_state.previous_default = NULL; /* Initalize is_fallthru state to false. */ @@ -3749,6 +3750,20 @@ ast_switch_statement::hir(exec_list *instructions, instructions->push_tail(set_fallthru_on_test); } else { /* default case */ + if (state->switch_state.previous_default) { + printf("a\n"); + YYLTYPE loc = this->get_location(); + _mesa_glsl_error(& loc, state, + "multiple default labels in one switch"); + + printf("b\n"); + + loc = state->switch_state.previous_default->get_location(); + _mesa_glsl_error(& loc, state, + "this is the first default label"); + } + state->switch_state.previous_default = this; + /* Set falltrhu state. */ ir_assignment *set_fallthru = diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h index d5d5101a820..ee8f71b8280 100644 --- a/src/glsl/glsl_parser_extras.h +++ b/src/glsl/glsl_parser_extras.h @@ -51,6 +51,7 @@ struct glsl_switch_state { /** Table of constant values already used in case labels */ struct hash_table *labels_ht; + class ast_case_label *previous_default; bool is_switch_innermost; // if switch stmt is closest to break, ... }; |