radv: Add missing includes and remove unnecessary NIR includes.

RADV won't compile without the added includes after we
stop including the full nir.h from the VK common functions.

Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Acked-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33439>

src/amd/vulkan/nir/radv_meta_nir.h

@@ -11,7 +11,8 @@
 #define RADV_META_NIR_H
 
 #include "vulkan/vulkan_core.h"
-#include "nir_builder.h"
+#include "compiler/shader_enums.h"
+#include "nir_defines.h"
 
 #ifdef __cplusplus
 extern "C" {

src/amd/vulkan/nir/radv_nir.h

@@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "amd_family.h"
-#include "nir.h"
+#include "nir_defines.h"
 
 #ifdef __cplusplus
 extern "C" {

src/amd/vulkan/nir/radv_nir_rt_common.c

@@ -7,6 +7,7 @@
 #include "nir/radv_nir_rt_common.h"
 #include "bvh/bvh.h"
 #include "radv_debug.h"
+#include "nir_builder.h"
 
 static nir_def *build_node_to_addr(struct radv_device *device, nir_builder *b, nir_def *node, bool skip_type_and);
 

src/amd/vulkan/nir/radv_nir_rt_common.h

@@ -7,8 +7,7 @@
 #ifndef RADV_RT_COMMON_H
 #define RADV_RT_COMMON_H
 
-#include "nir/nir.h"
-#include "nir/nir_builder.h"
+#include "nir/nir_defines.h"
 #include "vk_nir_convert_ycbcr.h"
 
 #include "compiler/spirv/spirv.h"

src/amd/vulkan/radv_acceleration_structure.c

@@ -5,7 +5,6 @@
  */
 
 #include "meta/radv_meta.h"
-#include "nir_builder.h"
 #include "radv_cs.h"
 #include "radv_entrypoints.h"
 

src/amd/vulkan/radv_cmd_buffer.c

@@ -39,6 +39,8 @@
 
 #include "aco_interface.h"
 
+#include "compiler/shader_info.h"
+#include "util/compiler.h"
 #include "util/fast_idiv_by_const.h"
 
 enum {

src/amd/vulkan/radv_formats.c

@@ -19,6 +19,7 @@
 #include "vk_log.h"
 #include "vk_util.h"
 
+#include "util/compiler.h"
 #include "util/format_r11g11b10f.h"
 #include "util/format_rgb9e5.h"
 #include "util/format_srgb.h"

src/amd/vulkan/radv_physical_device.h

@@ -20,7 +20,8 @@
 #include "ac_vcn_enc.h"
 #include "wsi_common.h"
 
-#include "nir.h"
+#include "nir_shader_compiler_options.h"
+#include "compiler/shader_enums.h"
 
 #include "vk_physical_device.h"
 

src/amd/vulkan/radv_pipeline.c

@@ -11,8 +11,6 @@
 #include "radv_pipeline.h"
 #include "meta/radv_meta.h"
 #include "nir/nir.h"
-#include "nir/nir_builder.h"
-#include "nir/nir_serialize.h"
 #include "nir/radv_nir.h"
 #include "spirv/nir_spirv.h"
 #include "util/disk_cache.h"

src/amd/vulkan/radv_pipeline.h

@@ -13,8 +13,6 @@
 
 #include "util/mesa-sha1.h"
 
-#include "nir.h"
-
 #include "vk_pipeline.h"
 #include "vk_pipeline_cache.h"
 
@@ -26,6 +24,8 @@ struct radv_shader_stage;
 struct radv_pipeline_layout;
 struct radv_graphics_state_key;
 struct radv_shader_layout;
+struct nir_shader;
+typedef struct nir_shader nir_shader;
 
 enum radv_pipeline_type {
    RADV_PIPELINE_GRAPHICS,

src/amd/vulkan/radv_pipeline_binary.c

@@ -5,13 +5,13 @@
  */
 
 #include "radv_pipeline_binary.h"
+#include "util/blob.h"
 #include "util/disk_cache.h"
 #include "util/macros.h"
 #include "util/mesa-blake3.h"
 #include "util/mesa-sha1.h"
 #include "util/u_atomic.h"
 #include "util/u_debug.h"
-#include "nir_serialize.h"
 #include "radv_debug.h"
 #include "radv_device.h"
 #include "radv_entrypoints.h"

src/amd/vulkan/radv_pipeline_cache.h

@@ -13,8 +13,6 @@
 
 #include "util/mesa-blake3.h"
 
-#include "nir.h"
-
 #include "vk_pipeline_cache.h"
 
 struct radv_device;
@@ -30,6 +28,8 @@ struct radv_shader_binary;
 struct radv_shader_stage;
 struct radv_spirv_to_nir_options;
 struct util_dynarray;
+struct nir_shader;
+typedef struct nir_shader nir_shader;
 
 void radv_hash_graphics_spirv_to_nir(blake3_hash hash, const struct radv_shader_stage *stage,
                                      const struct radv_spirv_to_nir_options *options);

src/amd/vulkan/radv_pipeline_rt.h

@@ -13,6 +13,7 @@
 
 #include "radv_pipeline_compute.h"
 #include "radv_shader.h"
+#include "util/bitset.h"
 
 struct radv_ray_tracing_pipeline {
    struct radv_compute_pipeline base;

src/amd/vulkan/radv_shader_info.h

@@ -14,13 +14,14 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include "nir.h"
 #include "nir_tcs_info.h"
 #include "radv_constants.h"
 #include "radv_shader_args.h"
+#include "util/set.h"
 
 struct radv_device;
 struct nir_shader;
+typedef struct nir_shader nir_shader;
 struct radv_shader_layout;
 struct radv_shader_stage_key;
 enum radv_pipeline_type;

src/amd/vulkan/radv_shader_object.c

@@ -13,6 +13,7 @@
 #include "radv_pipeline_compute.h"
 #include "radv_pipeline_graphics.h"
 #include "radv_shader_object.h"
+#include "util/blob.h"
 
 static void
 radv_shader_object_destroy_variant(struct radv_device *device, VkShaderCodeTypeEXT code_type,