From: Vincent Lejeune <vljn@ovi.com>
Date: Sat, 13 Apr 2013 14:35:39 +0000 (+0200)
Subject: /bin/bash: q : commande introuvable
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a7f73f5155d1b36bf493a70639ca9bcb023beba3;p=mesa.git

/bin/bash: q : commande introuvable
---

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 2907c7c15f2..9e83ce6f543 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -1899,7 +1899,7 @@ static int r600_shader_from_tgsi(struct r600_screen *rscreen,
 		}
 	}
 	/* add program end */
-	if (ctx.bc->chip_class == CAYMAN)
+	if (!use_llvm && ctx.bc->chip_class == CAYMAN)
 		cm_bytecode_add_cf_end(ctx.bc);
 
 	/* check GPR limit - we have 124 = 128 - 4
diff --git a/src/gallium/drivers/radeon/LLVM_REVISION.txt b/src/gallium/drivers/radeon/LLVM_REVISION.txt
index b633ea63610..f7e8f7dca2a 100644
--- a/src/gallium/drivers/radeon/LLVM_REVISION.txt
+++ b/src/gallium/drivers/radeon/LLVM_REVISION.txt
@@ -1 +1 @@
-@179684
+@180123