<div dir="ltr"><div>Reviewed-by: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>><br><br></div>Marek<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Apr 11, 2018 at 7:54 PM, Timothy Arceri <span dir="ltr"><<a href="mailto:tarceri@itsqueeze.com" target="_blank">tarceri@itsqueeze.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On 12/04/18 09:29, Timothy Arceri wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
The compatibility and core tokens were not added until GLSL 1.50,<br>
for GLSL 1.40 just assume all shader built with a compat profile<br>
are compat shaders.<br>
<br>
Fixes rendering issues in Dawn of War II on radeonsi which has<br>
enabled OpenGL 3.1 compat support.<br>
</blockquote>
<br></span>
oh and I've added this locally:<br>
<br>
Fixes: a0c8b49284ef "mesa: enable OpenGL 3.1 with ARB_compatibility"<span class="im HOEnZb"><br>
<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=105807" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/s<wbr>how_bug.cgi?id=105807</a><br>
---<br>
  src/compiler/glsl/glsl_parser_<wbr>extras.cpp | 2 ++<br>
  1 file changed, 2 insertions(+)<br>
<br>
diff --git a/src/compiler/glsl/glsl_parse<wbr>r_extras.cpp b/src/compiler/glsl/glsl_parse<wbr>r_extras.cpp<br>
index 0cc57f5a887..5dd362b3e38 100644<br>
--- a/src/compiler/glsl/glsl_parse<wbr>r_extras.cpp<br>
+++ b/src/compiler/glsl/glsl_parse<wbr>r_extras.cpp<br>
@@ -429,6 +429,8 @@ _mesa_glsl_parse_state::proces<wbr>s_version_directive(YYLTYPE *locp, int version,<br>
        this->language_version = version;<br>
       this->compat_shader = compat_token_present ||<br>
+                         (this->ctx->API == API_OPENGL_COMPAT &&<br>
+                          this->language_version == 140) ||<br>
                           (!this->es_shader && this->language_version < 140);<br>
       bool supported = false;<br>
<br>
</blockquote></span><div class="HOEnZb"><div class="h5">
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</div></div></blockquote></div><br></div>