Zebediah Figura : wined3d: Move struct wined3d_image_vk to wined3d_vk.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 972a782fd0807ed6028ad0db39823bc026532589
URL:    https://gitlab.winehq.org/wine/wine/-/commit/972a782fd0807ed6028ad0db39823bc...

Author: Zebediah Figura 
Date:   Thu Dec 22 15:10:20 2022 -0600

wined3d: Move struct wined3d_image_vk to wined3d_vk.h.

---

dlls/wined3d/wined3d_private.h | 12 ++----------
 dlls/wined3d/wined3d_vk.h      |  8 ++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 66a7ee9d711..c5e2a8eea2f 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1714,8 +1714,6 @@ struct wined3d_bo_user
     bool valid;
 };

-#include "wined3d_vk.h"
-
 struct wined3d_bo_address
 {
     struct wined3d_bo *buffer_object;
@@ -1733,14 +1731,6 @@ static inline struct wined3d_const_bo_address *wined3d_const_bo_address(const st
     return (struct wined3d_const_bo_address *)data;
 }

-struct wined3d_image_vk
-{
-    VkImage vk_image;
-    struct wined3d_allocator_block *memory;
-    VkDeviceMemory vk_memory;
-    uint64_t command_buffer_id;
-};
-
 struct wined3d_stream_info_element
 {
     const struct wined3d_format *format;
@@ -2106,6 +2096,8 @@ struct wined3d_pipeline_statistics_query

#define WINED3D_QUERY_POOL_SIZE 256

+#include "wined3d_vk.h"
+
 struct wined3d_query_pool_vk
 {
     struct list entry;
diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h
index 0f074207807..5d0ad6fda79 100644
--- a/dlls/wined3d/wined3d_vk.h
+++ b/dlls/wined3d/wined3d_vk.h
@@ -294,4 +294,12 @@ void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk,
 void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk,
         struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN;

+struct wined3d_image_vk
+{
+    VkImage vk_image;
+    struct wined3d_allocator_block *memory;
+    VkDeviceMemory vk_memory;
+    uint64_t command_buffer_id;
+};
+
 #endif /* __WINE_WINED3D_VK */