glsl: Avoid extra if statements for logic and/or with no side effects.

[mesa.git] / src / glsl / glsl_parser.yy

diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index 8948c34a237a0d65d4839348d1fbe51d7a879d93..d5e85abc021ad711de6ea6f96f32fbd03392fa69 100644 (file)
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -32,6 +32,12 @@
 
 #define YYLEX_PARAM state->scanner
 
+#undef yyerror
+
+static void yyerror(YYLTYPE *loc, _mesa_glsl_parse_state *st, const char *msg)
+{
+   _mesa_glsl_error(loc, st, "%s", msg);
+}
 %}
 
 %pure-parser
@@ -67,6 +73,11 @@
    ast_declarator_list *declarator_list;
    ast_struct_specifier *struct_specifier;
    ast_declaration *declaration;
+   ast_switch_body *switch_body;
+   ast_case_label *case_label;
+   ast_case_label_list *case_label_list;
+   ast_case_statement *case_statement;
+   ast_case_statement_list *case_statement_list;
 
    struct {
       ast_node *cond;
@@ -107,7 +118,7 @@
 %token INVARIANT
 %token LOWP MEDIUMP HIGHP SUPERP PRECISION
 
-%token VERSION EXTENSION LINE COLON EOL INTERFACE OUTPUT
+%token VERSION_TOK EXTENSION LINE COLON EOL INTERFACE OUTPUT
 %token PRAGMA_DEBUG_ON PRAGMA_DEBUG_OFF
 %token PRAGMA_OPTIMIZE_ON PRAGMA_OPTIMIZE_OFF
 %token PRAGMA_INVARIANT_ALL
@@ -208,11 +219,11 @@
 %type <node> selection_statement
 %type <selection_rest_statement> selection_rest_statement
 %type <node> switch_statement
-%type <node> switch_body
-%type <node> case_label
-%type <node> case_label_list
-%type <node> case_statement
-%type <node> case_statement_list
+%type <switch_body> switch_body
+%type <case_label_list> case_label_list
+%type <case_label> case_label
+%type <case_statement> case_statement
+%type <case_statement_list> case_statement_list
 %type <node> iteration_statement
 %type <node> condition
 %type <node> conditionopt
@@ -235,7 +246,7 @@ translation_unit:
 
 version_statement:
        /* blank - no #version specified: defaults are already set */
-       | VERSION INTCONSTANT EOL
+       | VERSION_TOK INTCONSTANT EOL
        {
           bool supported = false;
 
@@ -1119,7 +1130,9 @@ layout_qualifier_id:
           }
 
           /* Layout qualifiers for AMD/ARB_conservative_depth. */
-          if (!got_one && state->AMD_conservative_depth_enable) {
+          if (!got_one &&
+              (state->AMD_conservative_depth_enable ||
+               state->ARB_conservative_depth_enable)) {
              if (strcmp($1, "depth_any") == 0) {
                 got_one = true;
                 $$.flags.q.depth_any = 1;
@@ -1135,6 +1148,11 @@ layout_qualifier_id:
              }
        
              if (got_one && state->AMD_conservative_depth_warn) {
+                _mesa_glsl_warning(& @1, state,
+                                   "GL_AMD_conservative_depth "
+                                   "layout qualifier `%s' is used\n", $1);
+             }
+             if (got_one && state->ARB_conservative_depth_warn) {
                 _mesa_glsl_warning(& @1, state,
                                    "GL_ARB_conservative_depth "
                                    "layout qualifier `%s' is used\n", $1);
@@ -1652,58 +1670,82 @@ condition:
 switch_statement:
        SWITCH '(' expression ')' switch_body
        {
-          $$ = NULL;
+          $$ = new(state) ast_switch_statement($3, $5);
+          $$->set_location(yylloc);
        }
        ;
 
 switch_body:
        '{' '}'
        {
-          $$ = NULL;
+          $$ = new(state) ast_switch_body(NULL);
+          $$->set_location(yylloc);
        }
        | '{' case_statement_list '}'
        {
-          $$ = NULL;
+          $$ = new(state) ast_switch_body($2);
+          $$->set_location(yylloc);
        }
        ;
 
 case_label:
        CASE expression ':'
        {
-          $$ = NULL;
+          $$ = new(state) ast_case_label($2);
+          $$->set_location(yylloc);
        }
        | DEFAULT ':'
        {
-          $$ = NULL;
+          $$ = new(state) ast_case_label(NULL);
+          $$->set_location(yylloc);
        }
        ;
 
 case_label_list:
        case_label
        {
-          $$ = NULL;
+          ast_case_label_list *labels = new(state) ast_case_label_list();
+
+          labels->labels.push_tail(& $1->link);
+          $$ = labels;
+          $$->set_location(yylloc);
        }
        | case_label_list case_label
        {
-          $$ = NULL;
+          $$ = $1;
+          $$->labels.push_tail(& $2->link);
        }
        ;
 
 case_statement:
-       case_label_list statement_list
+       case_label_list statement
        {
-          $$ = NULL;
+          ast_case_statement *stmts = new(state) ast_case_statement($1);
+          stmts->set_location(yylloc);
+
+          stmts->stmts.push_tail(& $2->link);
+          $$ = stmts;
+       }
+       | case_statement statement
+       {
+          $$ = $1;
+          $$->stmts.push_tail(& $2->link);
        }
        ;
 
 case_statement_list:
        case_statement
        {
-          $$ = NULL;
+          ast_case_statement_list *cases= new(state) ast_case_statement_list();
+          cases->set_location(yylloc);
+
+          cases->cases.push_tail(& $1->link);
+          $$ = cases;
        }
        | case_statement_list case_statement
        {
-          $$ = NULL;
+          $$ = $1;
+          $$->cases.push_tail(& $2->link);
        }
        ;