I think this change broke the MSVC build for us.
I may not have time to investigate until later today.
-Brian
On 05/21/2019 05:41 AM, GitLab Mirror wrote:
> Module: Mesa
> Branch: master
> Commit: eb85124a9f6e9cb94d0d4a99f91bbae374777e3a
> URL: https://nam04.safelinks.protection.outlook.com/?url=""
>
> Author: Erik Faye-Lund <erik.faye-l...@collabora.com>
> Date: Mon May 20 13:29:05 2019 +0200
>
> glsl: do not use deprecated bison-keyword
>
> %error-verbose has been deprecated since Bison 3.0, which was released
> in 2013. In Bison 3.3.1 which was recently released, this has started
> causing warnings. Let's update the code to do this in the modern way
> intead, to avoid cluttering the output needlessly.
>
> Signed-off-by: Erik Faye-Lund <erik.faye-l...@collabora.com>
> Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com>
>
> ---
>
> src/compiler/glsl/glcpp/glcpp-parse.y | 2 +-
> src/compiler/glsl/glsl_parser.yy | 2 +-
> src/mesa/program/program_parse.y | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y
> index 1c095cb66f9..736af7e680d 100644
> --- a/src/compiler/glsl/glcpp/glcpp-parse.y
> +++ b/src/compiler/glsl/glcpp/glcpp-parse.y
> @@ -155,7 +155,7 @@ add_builtin_define(glcpp_parser_t *parser, const char *name, int value);
> %}
>
> %pure-parser
> -%error-verbose
> +%define parse.error verbose
>
> %locations
> %initial-action {
> diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy
> index 6426f890b9e..dc6aade2643 100644
> --- a/src/compiler/glsl/glsl_parser.yy
> +++ b/src/compiler/glsl/glsl_parser.yy
> @@ -81,7 +81,7 @@ static bool match_layout_qualifier(const char *s1, const char *s2,
> %expect 0
>
> %pure-parser
> -%error-verbose
> +%define parse.error verbose
>
> %locations
> %initial-action {
> diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y
> index 7398f5f507a..3d0c1e2ea9e 100644
> --- a/src/mesa/program/program_parse.y
> +++ b/src/mesa/program/program_parse.y
> @@ -124,7 +124,7 @@ static struct asm_instruction *asm_instruction_copy_ctor(
> %locations
> %lex-param { struct asm_parser_state *state }
> %parse-param { struct asm_parser_state *state }
> -%error-verbose
> +%define parse.error verbose
>
> %union {
> struct asm_instruction *inst;
>
> _______________________________________________
> mesa-commit mailing list
> mesa-com...@lists.freedesktop.org
> https://nam04.safelinks.protection.outlook.com/?url=""
>
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
