From: Timur Kristóf <timur.kristof@gmail.com>
Date: Fri, 31 Mar 2023 20:01:33 +0000 (+0200)
Subject: radv: Don't include nir.h in radv_shader.h
X-Git-Tag: upstream/23.3.3~10223
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14be6b084e7321a6a88bf7d17caf120037b2552d;p=platform%2Fupstream%2Fmesa.git

radv: Don't include nir.h in radv_shader.h

Avoid recompiling some RADV files when something changes in NIR.
Also clean up a few other includes.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22241>
---

diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index 431708c..251e1d2 100644
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -28,17 +28,13 @@
 #ifndef RADV_SHADER_H
 #define RADV_SHADER_H
 
+#include "util/u_math.h"
+#include "vulkan/vulkan.h"
 #include "ac_binary.h"
 #include "ac_shader_util.h"
-
 #include "amd_family.h"
 #include "radv_constants.h"
 
-#include "nir/nir.h"
-#include "vulkan/runtime/vk_object.h"
-#include "vulkan/runtime/vk_shader_module.h"
-#include "vulkan/vulkan.h"
-
 #include "aco_shader_info.h"
 
 #define RADV_VERT_ATTRIB_MAX MAX2(VERT_ATTRIB_MAX, VERT_ATTRIB_GENERIC0 + MAX_VERTEX_ATTRIBS)