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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 24ad12f322adab72e2df7ca6a27e6f50bba2c6bb
URL:    https://gitlab.winehq.org/wine/wine/-/commit/24ad12f322adab72e2df7ca6a27e6f5...

Author: Zebediah Figura 
Date:   Thu Dec 22 15:09:30 2022 -0600

wined3d: Move struct wined3d_bo_vk to wined3d_vk.h.

---

dlls/wined3d/wined3d_private.h | 47 +-----------------------------------------
 dlls/wined3d/wined3d_vk.h      | 46 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 2330ca66204..66a7ee9d711 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -54,7 +54,6 @@
 #include "objbase.h"
 #include "wine/wined3d.h"
 #include "wined3d_gl.h"
-#include "wined3d_vk.h"
 #include "wine/list.h"
 #include "wine/rbtree.h"
 #include "wine/wgl_driver.h"
@@ -1715,51 +1714,7 @@ struct wined3d_bo_user
     bool valid;
 };

-struct wined3d_bo_vk
-{
-    struct wined3d_bo b;
-
-    VkBuffer vk_buffer;
-    struct wined3d_allocator_block *memory;
-    struct wined3d_bo_slab_vk *slab;
-
-    VkDeviceMemory vk_memory;
-
-    VkDeviceSize size;
-    VkBufferUsageFlags usage;
-    VkMemoryPropertyFlags memory_type;
-
-    uint64_t command_buffer_id;
-    bool host_synced;
-};
-
-static inline struct wined3d_bo_vk *wined3d_bo_vk(struct wined3d_bo *bo)
-{
-    return CONTAINING_RECORD(bo, struct wined3d_bo_vk, b);
-}
-
-struct wined3d_bo_slab_vk_key
-{
-    VkMemoryPropertyFlags memory_type;
-    VkBufferUsageFlags usage;
-    VkDeviceSize size;
-};
-
-struct wined3d_bo_slab_vk
-{
-    struct wine_rb_entry entry;
-    struct wined3d_bo_slab_vk *next;
-    VkMemoryPropertyFlags requested_memory_type;
-    struct wined3d_bo_vk bo;
-    unsigned int map_count;
-    void *map_ptr;
-    uint32_t map;
-};
-
-void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk,
-        struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN;
-void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk,
-        struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN;
+#include "wined3d_vk.h"

struct wined3d_bo_address
 {
diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h
index 1e7fbf57ada..0f074207807 100644
--- a/dlls/wined3d/wined3d_vk.h
+++ b/dlls/wined3d/wined3d_vk.h
@@ -248,4 +248,50 @@ VkBufferUsageFlags vk_buffer_usage_from_bind_flags(uint32_t bind_flags) DECLSPEC
 VkMemoryPropertyFlags vk_memory_type_from_access_flags(uint32_t access, uint32_t usage) DECLSPEC_HIDDEN;
 const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN;

+struct wined3d_bo_vk
+{
+    struct wined3d_bo b;
+
+    VkBuffer vk_buffer;
+    struct wined3d_allocator_block *memory;
+    struct wined3d_bo_slab_vk *slab;
+
+    VkDeviceMemory vk_memory;
+
+    VkDeviceSize size;
+    VkBufferUsageFlags usage;
+    VkMemoryPropertyFlags memory_type;
+
+    uint64_t command_buffer_id;
+    bool host_synced;
+};
+
+static inline struct wined3d_bo_vk *wined3d_bo_vk(struct wined3d_bo *bo)
+{
+    return CONTAINING_RECORD(bo, struct wined3d_bo_vk, b);
+}
+
+struct wined3d_bo_slab_vk_key
+{
+    VkMemoryPropertyFlags memory_type;
+    VkBufferUsageFlags usage;
+    VkDeviceSize size;
+};
+
+struct wined3d_bo_slab_vk
+{
+    struct wine_rb_entry entry;
+    struct wined3d_bo_slab_vk *next;
+    VkMemoryPropertyFlags requested_memory_type;
+    struct wined3d_bo_vk bo;
+    unsigned int map_count;
+    void *map_ptr;
+    uint32_t map;
+};
+
+void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk,
+        struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN;
+void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk,
+        struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN;
+
 #endif /* __WINE_WINED3D_VK */