summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorVincent Lejeune <[email protected]>2013-04-13 16:35:39 +0200
committerVincent Lejeune <[email protected]>2013-04-23 19:52:02 +0200
commita7f73f5155d1b36bf493a70639ca9bcb023beba3 (patch)
treefbb6fb7de7dfdb0a46dcda85b4911f9509457e87 /src/gallium
parenta0c8942bb4742b4bd22f494cea4dcd59d9ca99ab (diff)
/bin/bash: q : commande introuvable
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/r600/r600_shader.c2
-rw-r--r--src/gallium/drivers/radeon/LLVM_REVISION.txt2
2 files changed, 2 insertions, 2 deletions
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