Mesa (master): radv: fixup botched llvm API changes.

Dave Airlie airlied at kemper.freedesktop.org
Thu Nov 10 04:13:44 UTC 2016


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Nov 10 14:12:32 2016 +1000

radv: fixup botched llvm API changes.

Reported-by: Jan Vesely <jan.vesely at rutgers.edu>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/amd/common/ac_nir_to_llvm.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 5468483..35e669a 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -296,14 +296,13 @@ create_llvm_function(LLVMContextRef ctx, LLVMModuleRef module,
 
 	LLVMSetFunctionCallConv(main_function, RADEON_LLVM_AMDGPU_CS);
 	for (unsigned i = 0; i < sgpr_params; ++i) {
-		LLVMValueRef P = LLVMGetParam(main_function, i);
-
 		if (i < array_params) {
-			ac_add_function_attr(P, i + 1, AC_FUNC_ATTR_BYVAL);
+			LLVMValueRef P = LLVMGetParam(main_function, i);
+			ac_add_function_attr(main_function, i + 1, AC_FUNC_ATTR_BYVAL);
 			ac_add_attr_dereferenceable(P, UINT64_MAX);
 		}
 		else {
-			ac_add_function_attr(P, i + 1, AC_FUNC_ATTR_INREG);
+			ac_add_function_attr(main_function, i + 1, AC_FUNC_ATTR_INREG);
 		}
 	}
 




More information about the mesa-commit mailing list