From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Tue, 13 Feb 2018 22:25:30 +0000 (+0100)
Subject: ac: Use the renumbered const address space for LLVM 7.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7461bd5b8f77652195bdb771232cb762b9b8758f;p=mesa.git

ac: Use the renumbered const address space for LLVM 7.

The LLVM AMDGPU backend decided to renumber the constant address
space ....

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
---

diff --git a/src/amd/common/ac_llvm_build.h b/src/amd/common/ac_llvm_build.h
index e78e9589cf3..a4d80cd8b00 100644
--- a/src/amd/common/ac_llvm_build.h
+++ b/src/amd/common/ac_llvm_build.h
@@ -35,7 +35,8 @@ extern "C" {
 #endif
 
 enum {
-	AC_CONST_ADDR_SPACE = 2, /* CONST is the only address space that selects SMEM loads */
+	/* CONST is the only address space that selects SMEM loads */
+	AC_CONST_ADDR_SPACE = HAVE_LLVM >= 0x700 ? 4 : 2,
 	AC_LOCAL_ADDR_SPACE = 3,
 };