Merge branch 'glsl-revert-for-byacc' into 'main'

Revert "glsl: Fixes warning: deprecated directive: ‘%pure-parser’, ‘%error-verbose’"

Closes #13904 and #14381

See merge request mesa/mesa!38727
This commit is contained in:
Icenowy Zheng 2025-12-20 08:46:57 +08:00
commit d118c7e3a6
5 changed files with 8 additions and 8 deletions

View file

@ -176,8 +176,8 @@ add_builtin_define(glcpp_parser_t *parser, const char *name, int value);
%} %}
%define api.pure %pure-parser
%define parse.error verbose %error-verbose
%locations %locations
%initial-action { %initial-action {

View file

@ -82,8 +82,8 @@ static bool match_layout_qualifier(const char *s1, const char *s2,
%expect 0 %expect 0
%define api.pure %pure-parser
%define parse.error verbose %error-verbose
%locations %locations
%initial-action { %initial-action {

View file

@ -185,7 +185,7 @@ label(const char *str)
%type <num> xmov %type <num> xmov
%type <num> peek %type <num> peek
%define parse.error verbose %error-verbose
%start instrs %start instrs

View file

@ -477,7 +477,7 @@ static void print_token(FILE *file, int type, YYSTYPE value)
%type <unum> const_val cat6_src_shift %type <unum> const_val cat6_src_shift
%type <num> buf_type %type <num> buf_type
%define parse.error verbose %error-verbose
%start shader %start shader

View file

@ -128,11 +128,11 @@ static struct asm_instruction *asm_instruction_copy_ctor(
} while(0) } while(0)
%} %}
%define api.pure %pure-parser
%locations %locations
%lex-param { struct asm_parser_state *state } %lex-param { struct asm_parser_state *state }
%parse-param { struct asm_parser_state *state } %parse-param { struct asm_parser_state *state }
%define parse.error verbose %error-verbose
%union { %union {
struct asm_instruction *inst; struct asm_instruction *inst;