Mesa (master): radeonsi: fix build of si_eliminate_const_vs_outputs on LLVM <= 3.8

Marek Olšák mareko at kemper.freedesktop.org
Thu Oct 20 09:11:40 UTC 2016


Module: Mesa
Branch: master
Commit: f19f71830bb342ff10019fca30dc5f1fd5755202
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f19f71830bb342ff10019fca30dc5f1fd5755202

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Oct 20 00:11:48 2016 +0200

radeonsi: fix build of si_eliminate_const_vs_outputs on LLVM <= 3.8

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/gallium/drivers/radeonsi/si_shader.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 3a84253..25449ec 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -6609,10 +6609,9 @@ static void si_eliminate_const_vs_outputs(struct si_shader_context *ctx)
 			if (LLVMGetInstructionOpcode(cur) != LLVMCall)
 				continue;
 
-			LLVMValueRef callee = LLVMGetCalledValue(cur);
-			LLVMValueKind kind = LLVMGetValueKind(callee);
+			LLVMValueRef callee = lp_get_called_value(cur);
 
-			if (kind != LLVMFunctionValueKind)
+			if (!lp_is_function(callee))
 				continue;
 
 			const char *name = LLVMGetValueName(callee);




More information about the mesa-commit mailing list