[Mesa-dev] [PATCH] glsl/glsl_parser_extras: Handle GLSL 4.50

[Matt Turner]

On Fri, Aug 22, 2014 at 1:29 AM, Olivier Galibert <galibert at pobox.com> wrote:
> Signed-off-by: Olivier Galibert <galibert at pobox.com>
> ---
>  src/glsl/glsl_parser_extras.cpp | 2 +-
>  src/glsl/glsl_parser_extras.h   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
> index 490c3c8..87d4846 100644
> --- a/src/glsl/glsl_parser_extras.cpp
> +++ b/src/glsl/glsl_parser_extras.cpp
> @@ -50,7 +50,7 @@ glsl_compute_version_string(void *mem_ctx, bool is_es, unsigned version)
>
>
>  static const unsigned known_desktop_glsl_versions[] =
> -   { 110, 120, 130, 140, 150, 330, 400, 410, 420, 430, 440 };
> +  { 110, 120, 130, 140, 150, 330, 400, 410, 420, 430, 440, 450 };

Did you change the leading whitespace on purpose?

>
>
>  _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx,
> diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
> index c8b9478..cd252f1 100644
> --- a/src/glsl/glsl_parser_extras.h
> +++ b/src/glsl/glsl_parser_extras.h
> @@ -215,7 +215,7 @@ struct _mesa_glsl_parse_state {
>     struct {
>        unsigned ver;
>        bool es;
> -   } supported_versions[12];
> +   } supported_versions[14];

Where does this number come from, and can we make it a little clearer
what it is?