[Mesa-dev] [PATCH] glsl: fix compat shaders in GLSL 1.40

Timothy Arceri tarceri at itsqueeze.com
Wed Apr 11 23:54:02 UTC 2018


On 12/04/18 09:29, Timothy Arceri wrote:
> The compatibility and core tokens were not added until GLSL 1.50,
> for GLSL 1.40 just assume all shader built with a compat profile
> are compat shaders.
> 
> Fixes rendering issues in Dawn of War II on radeonsi which has
> enabled OpenGL 3.1 compat support.

oh and I've added this locally:

Fixes: a0c8b49284ef "mesa: enable OpenGL 3.1 with ARB_compatibility"


> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105807
> ---
>   src/compiler/glsl/glsl_parser_extras.cpp | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp
> index 0cc57f5a887..5dd362b3e38 100644
> --- a/src/compiler/glsl/glsl_parser_extras.cpp
> +++ b/src/compiler/glsl/glsl_parser_extras.cpp
> @@ -429,6 +429,8 @@ _mesa_glsl_parse_state::process_version_directive(YYLTYPE *locp, int version,
>         this->language_version = version;
>   
>      this->compat_shader = compat_token_present ||
> +                         (this->ctx->API == API_OPENGL_COMPAT &&
> +                          this->language_version == 140) ||
>                            (!this->es_shader && this->language_version < 140);
>   
>      bool supported = false;
> 


More information about the mesa-dev mailing list