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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 85869cb78cde67f5150d92f796f8922655b2addd
URL:    https://gitlab.winehq.org/wine/wine/-/commit/85869cb78cde67f5150d92f796f8922...

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

wined3d: Move struct wined3d_swapchain_vk to wined3d_vk.h.

---

dlls/wined3d/wined3d_private.h | 32 ++------------------------------
 dlls/wined3d/wined3d_vk.h      | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 9c52f1c7eaf..00e1b31eac1 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4995,36 +4995,6 @@ HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl,
         struct wined3d_swapchain_state_parent *state_parent, void *parent,
         const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

-#include "wined3d_vk.h"
-
-struct wined3d_swapchain_vk
-{
-    struct wined3d_swapchain s;
-
-    VkSwapchainKHR vk_swapchain;
-    VkSurfaceKHR vk_surface;
-    VkImage *vk_images;
-    struct
-    {
-        VkSemaphore available;
-        VkSemaphore presentable;
-        uint64_t command_buffer_id;
-    } *vk_semaphores;
-    unsigned int current, image_count;
-    unsigned int width, height;
-};
-
-static inline struct wined3d_swapchain_vk *wined3d_swapchain_vk(struct wined3d_swapchain *swapchain)
-{
-    return CONTAINING_RECORD(swapchain, struct wined3d_swapchain_vk, s);
-}
-
-void wined3d_swapchain_vk_cleanup(struct wined3d_swapchain_vk *swapchain_vk) DECLSPEC_HIDDEN;
-HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain_vk *swapchain_vk,
-        struct wined3d_device *device, struct wined3d_swapchain_desc *desc,
-        struct wined3d_swapchain_state_parent *state_parent, void *parent,
-        const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;
-
 /*****************************************************************************
  * Utility function prototypes
  */
@@ -5545,6 +5515,8 @@ struct wined3d_format
     enum wined3d_format_id typeless_id;
 };

+#include "wined3d_vk.h"
+
 const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *adapter,
         enum wined3d_format_id format_id, unsigned int bind_flags) DECLSPEC_HIDDEN;
 enum wined3d_format_id wined3d_get_typed_format_id(const struct wined3d_adapter *adapter,
diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h
index 64e11cb7be8..0d5d120b271 100644
--- a/dlls/wined3d/wined3d_vk.h
+++ b/dlls/wined3d/wined3d_vk.h
@@ -993,4 +993,32 @@ HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_vi
 void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *view_vk,
         struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN;

+struct wined3d_swapchain_vk
+{
+    struct wined3d_swapchain s;
+
+    VkSwapchainKHR vk_swapchain;
+    VkSurfaceKHR vk_surface;
+    VkImage *vk_images;
+    struct
+    {
+        VkSemaphore available;
+        VkSemaphore presentable;
+        uint64_t command_buffer_id;
+    } *vk_semaphores;
+    unsigned int current, image_count;
+    unsigned int width, height;
+};
+
+static inline struct wined3d_swapchain_vk *wined3d_swapchain_vk(struct wined3d_swapchain *swapchain)
+{
+    return CONTAINING_RECORD(swapchain, struct wined3d_swapchain_vk, s);
+}
+
+void wined3d_swapchain_vk_cleanup(struct wined3d_swapchain_vk *swapchain_vk) DECLSPEC_HIDDEN;
+HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain_vk *swapchain_vk,
+        struct wined3d_device *device, struct wined3d_swapchain_desc *desc,
+        struct wined3d_swapchain_state_parent *state_parent, void *parent,
+        const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;
+
 #endif /* __WINE_WINED3D_VK */