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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 97548eb4c9d4dca33fca5adc79322396a337d719
URL:    https://gitlab.winehq.org/wine/wine/-/commit/97548eb4c9d4dca33fca5adc7932239...

Author: Zebediah Figura 
Date:   Thu Dec 22 15:26:01 2022 -0600

wined3d: Move struct wined3d_buffer_vk to wined3d_vk.h.

---

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

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index f293ef04624..e058d4ef9cb 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -112,7 +112,6 @@ static inline const char *wined3d_get_line(const char **ptr, const char *end)

struct wined3d_fragment_pipe_ops;
 struct wined3d_adapter;
-struct wined3d_buffer_vk;
 struct wined3d_context;
 struct wined3d_context_vk;
 struct wined3d_gl_info;
@@ -4778,26 +4777,6 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined

#include "wined3d_vk.h"

-struct wined3d_buffer_vk
-{
-    struct wined3d_buffer b;
-
-    VkDescriptorBufferInfo buffer_info;
-    uint32_t bind_mask;
-};
-
-static inline struct wined3d_buffer_vk *wined3d_buffer_vk(struct wined3d_buffer *buffer)
-{
-    return CONTAINING_RECORD(buffer, struct wined3d_buffer_vk, b);
-}
-
-void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk,
-        struct wined3d_context_vk *context_vk, uint32_t bind_mask) DECLSPEC_HIDDEN;
-const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk) DECLSPEC_HIDDEN;
-HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined3d_device *device,
-        const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data,
-        void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;
-
 static inline void wined3d_resource_vk_barrier(struct wined3d_resource *resource,
         struct wined3d_context_vk *context_vk, uint32_t bind_mask)
 {
diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h
index deb855fe55c..6514ece2068 100644
--- a/dlls/wined3d/wined3d_vk.h
+++ b/dlls/wined3d/wined3d_vk.h
@@ -25,6 +25,7 @@
 #define VK_NO_PROTOTYPES
 #include "wine/vulkan.h"

+struct wined3d_buffer_vk;
 struct wined3d_device_vk;

#define VK_INSTANCE_FUNCS() \
@@ -859,4 +860,24 @@ void wined3d_sampler_vk_init(struct wined3d_sampler_vk *sampler_vk,
         struct wined3d_device *device, const struct wined3d_sampler_desc *desc,
         void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

+struct wined3d_buffer_vk
+{
+    struct wined3d_buffer b;
+
+    VkDescriptorBufferInfo buffer_info;
+    uint32_t bind_mask;
+};
+
+static inline struct wined3d_buffer_vk *wined3d_buffer_vk(struct wined3d_buffer *buffer)
+{
+    return CONTAINING_RECORD(buffer, struct wined3d_buffer_vk, b);
+}
+
+void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk,
+        struct wined3d_context_vk *context_vk, uint32_t bind_mask) DECLSPEC_HIDDEN;
+const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk) DECLSPEC_HIDDEN;
+HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined3d_device *device,
+        const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data,
+        void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;
+
 #endif /* __WINE_WINED3D_VK */