aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2017-03-24 00:17:23 +0100
committerAndres Gomez <[email protected]>2017-03-29 19:13:18 +0300
commite11bf563dd411edb5260f4b8e28edb3c905725e2 (patch)
tree76df0f03a0b41bc08f1c60ae4eff9a4f5bfc60ef /src/gallium
parentc375c448bf529952afec3df62aff5f9f506c498e (diff)
radeonsi: don't hang on shader compile failure
Cc: 17.0 <[email protected]> Reviewed-by: Samuel Pitoiset <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]> (cherry picked from commit 518d8341627ac80f8757fd09cc3cd5c2884f58e0)
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/radeonsi/si_state_shaders.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index caf20e59b57..5a3d238fb3f 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -1146,7 +1146,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