Module: Mesa
Branch: master
Commit: 61926733f979dc397e9011878e478fcb75aaa7cb
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=61926733f979dc397e9011878e478fcb75aaa7cb
Author: Marek Olšák <marek.ol...@amd.com>
Date: Fri Mar 24 00:38:15 2017 +0100
radeonsi: don't crash on compute shader compile failure
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com>
---
src/gallium/drivers/radeonsi/si_compute.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/gallium/drivers/radeonsi/si_compute.c
b/src/gallium/drivers/radeonsi/si_compute.c
index 19a9189e73..46476b68be 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -746,9 +746,13 @@ static void si_launch_grid(
sctx->b.flags |= SI_CONTEXT_PS_PARTIAL_FLUSH |
SI_CONTEXT_CS_PARTIAL_FLUSH;
- if (program->ir_type == PIPE_SHADER_IR_TGSI)
+ if (program->ir_type == PIPE_SHADER_IR_TGSI) {
util_queue_fence_wait(&program->ready);
+ if (program->shader.compilation_failed)
+ return;
+ }
+
si_decompress_compute_textures(sctx);
/* Add buffer sizes for memory checking in need_cs_space. */
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
