panvk: Make panvk_meta.h per-gen

All the meta stuff is per-gen anyway, and there's nothing in
pan_device.h needing the stuff defined in panvk_meta.h, so let's
just make this file per-gen, which will allow us to use PAN_ARCH in
the inline helpers.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37158>

src/panfrost/vulkan/bifrost/panvk_vX_meta_desc_copy.c

@@ -18,6 +18,7 @@
 #include "panvk_cmd_alloc.h"
 #include "panvk_cmd_buffer.h"
 #include "panvk_device.h"
+#include "panvk_meta.h"
 #include "panvk_shader.h"
 
 struct pan_nir_desc_copy_info {

src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c

@@ -41,6 +41,7 @@
 #include "panvk_entrypoints.h"
 #include "panvk_instance.h"
 #include "panvk_instr.h"
+#include "panvk_meta.h"
 #include "panvk_physical_device.h"
 #include "panvk_priv_bo.h"
 #include "panvk_tracepoints.h"

src/panfrost/vulkan/csf/panvk_vX_cmd_event.c

@@ -7,6 +7,7 @@
 #include "panvk_entrypoints.h"
 #include "panvk_event.h"
 #include "panvk_instr.h"
+#include "panvk_meta.h"
 
 #include "util/bitscan.h"
 

src/panfrost/vulkan/jm/panvk_vX_cmd_buffer.c

@@ -39,6 +39,7 @@
 #include "panvk_device.h"
 #include "panvk_entrypoints.h"
 #include "panvk_instance.h"
+#include "panvk_meta.h"
 #include "panvk_physical_device.h"
 #include "panvk_priv_bo.h"
 

src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c

@@ -23,6 +23,7 @@
 #include "panvk_image.h"
 #include "panvk_image_view.h"
 #include "panvk_instance.h"
+#include "panvk_meta.h"
 #include "panvk_priv_bo.h"
 #include "panvk_shader.h"
 

src/panfrost/vulkan/jm/panvk_vX_cmd_event.c

@@ -12,6 +12,7 @@
 #include "panvk_cmd_buffer.h"
 #include "panvk_entrypoints.h"
 #include "panvk_event.h"
+#include "panvk_meta.h"
 
 #include "util/u_dynarray.h"
 

src/panfrost/vulkan/panvk_android.c

@@ -6,6 +6,7 @@
 #include "panvk_android.h"
 
 #include "panvk_device.h"
+#include "panvk_image.h"
 
 #include "vndk/hardware_buffer.h"
 #include "vulkan/vk_android_native_buffer.h"

src/panfrost/vulkan/panvk_device.h

@@ -16,7 +16,6 @@
 #include "panvk_instance.h"
 #include "panvk_macros.h"
 #include "panvk_mempool.h"
-#include "panvk_meta.h"
 #include "panvk_physical_device.h"
 #include "panvk_utrace_perfetto.h"
 

src/panfrost/vulkan/panvk_host_copy.c

@@ -9,6 +9,7 @@
 #include "pan_tiling.h"
 #include "panvk_image.h"
 
+#include "vk_format.h"
 #include "vk_object.h"
 #include "vk_util.h"
 

src/panfrost/vulkan/panvk_meta.h

@@ -6,6 +6,10 @@
 #ifndef PANVK_META_H
 #define PANVK_META_H
 
+#ifndef PAN_ARCH
+#error "PAN_ARCH must be defined"
+#endif
+
 #include "panvk_image.h"
 #include "panvk_mempool.h"
 
@@ -144,7 +148,7 @@ panvk_meta_copy_get_image_properties(struct panvk_image *img)
    return props;
 }
 
-#if defined(PAN_ARCH) && PAN_ARCH < 9
+#if PAN_ARCH < 9
 struct panvk_cmd_buffer;
 struct panvk_descriptor_state;
 struct panvk_device;
@@ -158,13 +162,11 @@ VkResult panvk_per_arch(meta_get_copy_desc_job)(
    uint32_t attrib_buf_idx_offset, struct pan_ptr *job_desc);
 #endif
 
-#if defined(PAN_ARCH)
 void panvk_per_arch(transition_image_layout_sync_scope)(
    const VkImageMemoryBarrier2 *barrier,
    VkPipelineStageFlags2 *out_stages, VkAccessFlags2 *out_access);
 void panvk_per_arch(cmd_transition_image_layout)(
    VkCommandBuffer _cmdbuf,
    const VkImageMemoryBarrier2 *barrier);
-#endif
 
 #endif

src/panfrost/vulkan/panvk_physical_device.c

@@ -24,6 +24,7 @@
 
 #include "panvk_device.h"
 #include "panvk_entrypoints.h"
+#include "panvk_image.h"
 #include "panvk_instance.h"
 #include "panvk_physical_device.h"
 #include "panvk_wsi.h"

src/panfrost/vulkan/panvk_vX_blend.c

@@ -17,6 +17,7 @@
 #include "panvk_blend.h"
 #include "panvk_cmd_buffer.h"
 #include "panvk_device.h"
+#include "panvk_meta.h"
 #include "panvk_shader.h"
 
 struct panvk_blend_shader_key {

src/panfrost/vulkan/panvk_vX_cmd_meta.c

@@ -6,6 +6,7 @@
 
 #include "panvk_cmd_meta.h"
 #include "panvk_entrypoints.h"
+#include "panvk_meta.h"
 #include "panvk_tracepoints.h"
 #if PAN_ARCH >= 10
 #include "csf/panvk_instr.h"