<div dir="auto"><div>Reviewed-by: Bas Nieuwenhuizen <<a href="mailto:bas@basnieuwenhuizen.nl">bas@basnieuwenhuizen.nl</a>><br><br><div class="gmail_quote"><div dir="ltr">On Wed, Dec 19, 2018, 6:13 PM Samuel Pitoiset <<a href="mailto:samuel.pitoiset@gmail.com">samuel.pitoiset@gmail.com</a> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This workaround has been introduced by 135e4d434f6 for fixing<br>
DXVK GPU hangs with many games. It is no longer needed since<br>
LLVM r345718.<br>
<br>
Signed-off-by: Samuel Pitoiset <<a href="mailto:samuel.pitoiset@gmail.com" target="_blank" rel="noreferrer">samuel.pitoiset@gmail.com</a>><br>
---<br>
 src/amd/vulkan/radv_shader.c | 12 +++++++++---<br>
 1 file changed, 9 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c<br>
index 2eb5164ac97..5c72890aa8e 100644<br>
--- a/src/amd/vulkan/radv_shader.c<br>
+++ b/src/amd/vulkan/radv_shader.c<br>
@@ -548,9 +548,15 @@ static void radv_init_llvm_target()<br>
         *<br>
         * "mesa" is the prefix for error messages.<br>
         */<br>
-       const char *argv[3] = { "mesa", "-simplifycfg-sink-common=false",<br>
-                               "-amdgpu-skip-threshold=1" };<br>
-       LLVMParseCommandLineOptions(3, argv, NULL);<br>
+       if (HAVE_LLVM >= 0x0800) {<br>
+               const char *argv[2] = { "mesa", "-simplifycfg-sink-common=false" };<br>
+               LLVMParseCommandLineOptions(2, argv, NULL);<br>
+<br>
+       } else {<br>
+               const char *argv[3] = { "mesa", "-simplifycfg-sink-common=false",<br>
+                                       "-amdgpu-skip-threshold=1" };<br>
+               LLVMParseCommandLineOptions(3, argv, NULL);<br>
+       }<br>
 }<br>
<br>
 static once_flag radv_init_llvm_target_once_flag = ONCE_FLAG_INIT;<br>
-- <br>
2.20.1<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank" rel="noreferrer">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</blockquote></div></div></div>