Mesa (master): radv: cleanup LLVM related includes

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu Apr 22 15:59:22 2021 +0200

radv: cleanup LLVM related includes

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10403>

---

 src/amd/vulkan/radv_llvm_helper.cpp           | 1 -
 src/amd/vulkan/radv_nir_to_llvm.c             | 2 +-
 src/amd/vulkan/radv_pipeline.c                | 2 --
 src/amd/vulkan/radv_pipeline_cache.c          | 2 --
 src/amd/vulkan/radv_private.h                 | 4 +---
 src/amd/vulkan/radv_shader.c                  | 1 -
 src/amd/vulkan/radv_shader_helper.h           | 3 +++
 src/amd/vulkan/winsys/null/radv_null_winsys.c | 2 --
 8 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/amd/vulkan/radv_llvm_helper.cpp b/src/amd/vulkan/radv_llvm_helper.cpp
index f5eed3545e4..c47193e6103 100644
--- a/src/amd/vulkan/radv_llvm_helper.cpp
+++ b/src/amd/vulkan/radv_llvm_helper.cpp
@@ -20,7 +20,6 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#include "ac_llvm_build.h"
 #include "ac_llvm_util.h"
 #include "radv_shader_helper.h"
 
diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index 51dfd318b95..5234a6cd66f 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -35,7 +35,7 @@
 #include "ac_binary.h"
 #include "ac_exp_param.h"
 #include "ac_llvm_build.h"
-#include "ac_llvm_util.h"
+#include "ac_nir_to_llvm.h"
 #include "ac_shader_abi.h"
 #include "ac_shader_util.h"
 #include "sid.h"
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index ab2149f9ec5..9fc759526a6 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -41,8 +41,6 @@
 #include "util/debug.h"
 #include "ac_binary.h"
 #include "ac_exp_param.h"
-#include "ac_llvm_util.h"
-#include "ac_nir_to_llvm.h"
 #include "ac_nir.h"
 #include "ac_shader_util.h"
 #include "aco_interface.h"
diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c
index dafe9b43b74..f0fb1428d55 100644
--- a/src/amd/vulkan/radv_pipeline_cache.c
+++ b/src/amd/vulkan/radv_pipeline_cache.c
@@ -31,8 +31,6 @@
 #include "radv_private.h"
 #include "radv_shader.h"
 
-#include "ac_nir_to_llvm.h"
-
 struct cache_entry {
    union {
       unsigned char sha1[20];
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 6dd14d80e8b..76550df59ea 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -65,9 +65,7 @@
 
 #include "ac_binary.h"
 #include "ac_gpu_info.h"
-#include "ac_llvm_build.h"
-#include "ac_llvm_util.h"
-#include "ac_nir_to_llvm.h"
+#include "ac_shader_util.h"
 #include "ac_sqtt.h"
 #include "ac_surface.h"
 #include "radv_constants.h"
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index ab1c6e9d156..cf40d00c194 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -42,7 +42,6 @@
 #include "ac_exp_param.h"
 #include "ac_llvm_util.h"
 #include "ac_nir.h"
-#include "ac_nir_to_llvm.h"
 #include "ac_rtld.h"
 #include "aco_interface.h"
 #include "sid.h"
diff --git a/src/amd/vulkan/radv_shader_helper.h b/src/amd/vulkan/radv_shader_helper.h
index adf1f27dff9..5e01ca40145 100644
--- a/src/amd/vulkan/radv_shader_helper.h
+++ b/src/amd/vulkan/radv_shader_helper.h
@@ -22,6 +22,9 @@
  */
 #ifndef RADV_SHADER_HELPER_H
 #define RADV_SHADER_HELPER_H
+
+#include "ac_llvm_util.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/amd/vulkan/winsys/null/radv_null_winsys.c b/src/amd/vulkan/winsys/null/radv_null_winsys.c
index 6afd02e8d6e..44ed4b371d6 100644
--- a/src/amd/vulkan/winsys/null/radv_null_winsys.c
+++ b/src/amd/vulkan/winsys/null/radv_null_winsys.c
@@ -29,8 +29,6 @@
 #include "radv_null_bo.h"
 #include "radv_null_cs.h"
 
-#include "ac_llvm_util.h"
-
 /* Hardcode some GPU info that are needed for the driver or for some tools. */
 static const struct {
    uint32_t pci_id;