From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 23 Mar 2017 23:38:15 +0000 (+0100)
Subject: radeonsi: don't crash on compute shader compile failure
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=61926733f979dc397e9011878e478fcb75aaa7cb;p=mesa.git

radeonsi: don't crash on compute shader compile failure

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index 19a9189e739..46476b68beb 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. */