Mesa (main): drirc: add Mari application workaround

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Nov 2 02:58:21 UTC 2021


Module: Mesa
Branch: main
Commit: c7f481c615d24846b4d8da48506a4d4a9a9ea7a0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c7f481c615d24846b4d8da48506a4d4a9a9ea7a0

Author: Qiang Yu <yuq825 at gmail.com>
Date:   Tue Oct 12 11:46:28 2021 +0800

drirc: add Mari application workaround

To allow using non-constant sampler array index. This prevent
Mari render fail for any scene.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Signed-off-by: Qiang Yu <yuq825 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13304>

---

 src/util/00-mesa-defaults.conf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 004b904e2f7..b7084b5c1b2 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -334,6 +334,12 @@ TODO: document the other workarounds.
             <option name="do_dce_before_clip_cull_analysis" value="true" />
         </application>
 
+        <!-- Workaround for Mari with executable name like Mari4.5v2, Mari4.7v4 -->
+        <application name="Mari" executable_regexp="Mari[0-9]+[.][0-9]+v[0-9]+">
+            <!-- Need ARB_gpu_shader5 for non-const sampler array index support -->
+            <option name="force_glsl_extensions_warn" value="true" />
+        </application>
+
         <!-- The GL thread allowlist is below, workarounds are above.
              Keep it that way. -->
 



More information about the mesa-commit mailing list