From a29fda1ba06628adfb0dff9bd20c0faaea2e1ca5 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 4 Apr 2024 15:50:16 +0200
Subject: [PATCH] radv: move radv_printf_data to radv_printf.h

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28592>
---
 src/amd/vulkan/radv_device.h | 10 +---------
 src/amd/vulkan/radv_printf.c |  1 +
 src/amd/vulkan/radv_printf.h | 19 ++++++++++++++++++-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/amd/vulkan/radv_device.h b/src/amd/vulkan/radv_device.h
index c4c62a017c1..5ea5eb2b567 100644
--- a/src/amd/vulkan/radv_device.h
+++ b/src/amd/vulkan/radv_device.h
@@ -33,6 +33,7 @@
 
 #include "util/mesa-blake3.h"
 
+#include "radv_printf.h"
 #include "radv_queue.h"
 #include "radv_radeon_winsys.h"
 #include "radv_rra.h"
@@ -79,15 +80,6 @@ struct radv_device_cache_key {
    uint32_t primitives_generated_query : 1;
 };
 
-struct radv_printf_data {
-   uint32_t buffer_size;
-   VkBuffer buffer;
-   VkDeviceMemory memory;
-   VkDeviceAddress buffer_addr;
-   void *data;
-   struct util_dynarray formats;
-};
-
 enum radv_force_vrs {
    RADV_FORCE_VRS_1x1 = 0,
    RADV_FORCE_VRS_2x2,
diff --git a/src/amd/vulkan/radv_printf.c b/src/amd/vulkan/radv_printf.c
index 8267ee0c995..dd560d8bb45 100644
--- a/src/amd/vulkan/radv_printf.c
+++ b/src/amd/vulkan/radv_printf.c
@@ -5,6 +5,7 @@
  */
 
 #include "radv_printf.h"
+#include "radv_device.h"
 #include "radv_physical_device.h"
 
 #include "util/hash_table.h"
diff --git a/src/amd/vulkan/radv_printf.h b/src/amd/vulkan/radv_printf.h
index 633310e13fe..d10eb84d9a3 100644
--- a/src/amd/vulkan/radv_printf.h
+++ b/src/amd/vulkan/radv_printf.h
@@ -28,11 +28,28 @@
 #ifndef RADV_PRINTF_H
 #define RADV_PRINTF_H
 
-#include "radv_device.h"
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdio.h>
 
+#include <vulkan/vulkan_core.h>
+
+#include "util/u_dynarray.h"
+
+struct radv_device;
 typedef struct nir_builder nir_builder;
+typedef struct nir_shader nir_shader;
 typedef struct nir_def nir_def;
 
+struct radv_printf_data {
+   uint32_t buffer_size;
+   VkBuffer buffer;
+   VkDeviceMemory memory;
+   VkDeviceAddress buffer_addr;
+   void *data;
+   struct util_dynarray formats;
+};
+
 struct radv_printf_format {
    char *string;
    uint32_t divergence_mask;