Mesa (master): radeonsi: don't hang on shader compile failure

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 518d8341627ac80f8757fd09cc3cd5c2884f58e0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=518d8341627ac80f8757fd09cc3cd5c2884f58e0

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Mar 24 00:17:23 2017 +0100

radeonsi: don't hang on shader compile failure

Cc: 17.0 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/gallium/drivers/radeonsi/si_state_shaders.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 30856b08ac..e1286b8933 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -1246,7 +1246,7 @@ again:
 		   memcmp(&current->key, key, sizeof(*key)) == 0 &&
 		   (!current->is_optimized ||
 		    util_queue_fence_is_signalled(&current->optimized_ready))))
-		return 0;
+		return current->compilation_failed ? -1 : 0;
 
 	/* This must be done before the mutex is locked, because async GS
 	 * compilation calls this function too, and therefore must enter