[PATCH 0/6] MR3320: wined3d: Move Vulkan declarations to wined3d_vk.h, part 3/3.

[PATCH 1/6] wined3d: Move struct wined3d_unordered_access_view_vk to wined3d_vk.h.

[Zebediah Figura]

From: Zebediah Figura

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

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index aedfc3f789f..9c52f1c7eaf 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4913,37 +4913,6 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi
 void wined3d_unordered_access_view_gl_update(struct wined3d_unordered_access_view_gl *uav_gl,
         struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN;

-#include "wined3d_vk.h"
-
-struct wined3d_unordered_access_view_vk
-{
-    struct wined3d_unordered_access_view v;
-    struct wined3d_view_vk view_vk;
-
-    VkBufferView vk_counter_view;
-    struct wined3d_bo_vk counter_bo;
-};
-
-static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_view_vk(
-        struct wined3d_unordered_access_view *view)
-{
-    return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_vk, v);
-}
-
-static inline void wined3d_unordered_access_view_vk_barrier(struct wined3d_unordered_access_view_vk *uav_vk,
-        struct wined3d_context_vk *context_vk, uint32_t bind_mask)
-{
-    wined3d_resource_vk_barrier(uav_vk->v.resource, context_vk, bind_mask);
-}
-
-void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view_vk *view_vk,
-        const struct wined3d_uvec4 *clear_value, struct wined3d_context_vk *context_vk, bool fp) DECLSPEC_HIDDEN;
-HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk,
-        const struct wined3d_view_desc *desc, struct wined3d_resource *resource,
-        void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;
-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_state
 {
     struct wined3d *wined3d;
@@ -5026,6 +4995,8 @@ 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;
diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h
index d2067d5f9fb..64e11cb7be8 100644
--- a/dlls/wined3d/wined3d_vk.h
+++ b/dlls/wined3d/wined3d_vk.h
@@ -964,4 +964,33 @@ void wined3d_shader_resource_view_vk_update_buffer(struct wined3d_shader_resourc
 void wined3d_shader_resource_view_vk_update_layout(struct wined3d_shader_resource_view_vk *srv_vk,
         VkImageLayout layout) DECLSPEC_HIDDEN;

+struct wined3d_unordered_access_view_vk
+{
+    struct wined3d_unordered_access_view v;
+    struct wined3d_view_vk view_vk;
+
+    VkBufferView vk_counter_view;
+    struct wined3d_bo_vk counter_bo;
+};
+
+static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_view_vk(
+        struct wined3d_unordered_access_view *view)
+{
+    return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_vk, v);
+}
+
+static inline void wined3d_unordered_access_view_vk_barrier(struct wined3d_unordered_access_view_vk *uav_vk,
+        struct wined3d_context_vk *context_vk, uint32_t bind_mask)
+{
+    wined3d_resource_vk_barrier(uav_vk->v.resource, context_vk, bind_mask);
+}
+
+void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view_vk *view_vk,
+        const struct wined3d_uvec4 *clear_value, struct wined3d_context_vk *context_vk, bool fp) DECLSPEC_HIDDEN;
+HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk,
+        const struct wined3d_view_desc *desc, struct wined3d_resource *resource,
+        void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;
+void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *view_vk,
+        struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN;
+
 #endif /* __WINE_WINED3D_VK */

[PATCH 2/6] wined3d: Move struct wined3d_swapchain_vk to wined3d_vk.h.

[Zebediah Figura]

From: Zebediah Figura

---
 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 */

[PATCH 3/6] wined3d: Move struct wined3d_format_vk to wined3d_vk.h.

[Zebediah Figura]

From: Zebediah Figura

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

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 00e1b31eac1..c3c3e2eef0f 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -5515,8 +5515,6 @@ 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,
@@ -5525,8 +5523,6 @@ void wined3d_format_calculate_pitch(const struct wined3d_format *format, unsigne
         unsigned int width, unsigned int height, unsigned int *row_pitch, unsigned int *slice_pitch) DECLSPEC_HIDDEN;
 UINT wined3d_format_calculate_size(const struct wined3d_format *format,
         UINT alignment, UINT width, UINT height, UINT depth) DECLSPEC_HIDDEN;
-void wined3d_format_colour_to_vk(const struct wined3d_format *format, const struct wined3d_color *c,
-        VkClearColorValue *retval) DECLSPEC_HIDDEN;
 void wined3d_format_convert_from_float(const struct wined3d_format *format,
         const struct wined3d_color *color, void *ret) DECLSPEC_HIDDEN;
 void wined3d_format_copy_data(const struct wined3d_format *format, const uint8_t *src,
@@ -5563,18 +5559,6 @@ static inline const struct wined3d_format_gl *wined3d_format_gl(const struct win
     return CONTAINING_RECORD(format, struct wined3d_format_gl, f);
 }

-struct wined3d_format_vk
-{
-    struct wined3d_format f;
-
-    VkFormat vk_format;
-};
-
-static inline const struct wined3d_format_vk *wined3d_format_vk(const struct wined3d_format *format)
-{
-    return CONTAINING_RECORD(format, struct wined3d_format_vk, f);
-}
-
 BOOL wined3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) DECLSPEC_HIDDEN;

static inline BOOL wined3d_format_is_typeless(const struct wined3d_format *format)
@@ -5845,6 +5829,8 @@ static inline void wined3d_context_destroy_bo(struct wined3d_context *context, s
     context->device->adapter->adapter_ops->adapter_destroy_bo(context, bo);
 }

+#include "wined3d_vk.h"
+
 static inline void wined3d_context_vk_reference_bo(const struct wined3d_context_vk *context_vk,
         struct wined3d_bo_vk *bo)
 {
diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h
index 0d5d120b271..9e24fbafd85 100644
--- a/dlls/wined3d/wined3d_vk.h
+++ b/dlls/wined3d/wined3d_vk.h
@@ -250,6 +250,8 @@ VkAccessFlags vk_access_mask_from_buffer_usage(VkBufferUsageFlags usage) DECLSPE
 VkPipelineStageFlags vk_pipeline_stage_mask_from_buffer_usage(VkBufferUsageFlags usage) DECLSPEC_HIDDEN;
 VkBufferUsageFlags vk_buffer_usage_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN;
 VkMemoryPropertyFlags vk_memory_type_from_access_flags(uint32_t access, uint32_t usage) DECLSPEC_HIDDEN;
+void wined3d_format_colour_to_vk(const struct wined3d_format *format, const struct wined3d_color *c,
+        VkClearColorValue *retval) DECLSPEC_HIDDEN;
 void wined3d_vk_swizzle_from_color_fixup(VkComponentMapping *mapping, struct color_fixup_desc fixup) DECLSPEC_HIDDEN;
 const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN;

@@ -1021,4 +1023,16 @@ HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain_vk *swapchain_vk,
         struct wined3d_swapchain_state_parent *state_parent, void *parent,
         const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

+struct wined3d_format_vk
+{
+    struct wined3d_format f;
+
+    VkFormat vk_format;
+};
+
+static inline const struct wined3d_format_vk *wined3d_format_vk(const struct wined3d_format *format)
+{
+    return CONTAINING_RECORD(format, struct wined3d_format_vk, f);
+}
+
 #endif /* __WINE_WINED3D_VK */

[PATCH 4/6] wined3d: Move remaining wined3d_context_vk functions to wined3d_vk.h.

[Zebediah Figura]

From: Zebediah Figura

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

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index c3c3e2eef0f..fd7d766a1a4 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -113,7 +113,6 @@ static inline const char *wined3d_get_line(const char **ptr, const char *end)
 struct wined3d_fragment_pipe_ops;
 struct wined3d_adapter;
 struct wined3d_context;
-struct wined3d_context_vk;
 struct wined3d_gl_info;
 struct wined3d_state;
 struct wined3d_swapchain_gl;
@@ -5829,68 +5828,6 @@ static inline void wined3d_context_destroy_bo(struct wined3d_context *context, s
     context->device->adapter->adapter_ops->adapter_destroy_bo(context, bo);
 }

-#include "wined3d_vk.h"
-
-static inline void wined3d_context_vk_reference_bo(const struct wined3d_context_vk *context_vk,
-        struct wined3d_bo_vk *bo)
-{
-    bo->command_buffer_id = context_vk->current_command_buffer.id;
-}
-
-static inline void wined3d_context_vk_reference_image(const struct wined3d_context_vk *context_vk,
-        struct wined3d_image_vk *image)
-{
-    image->command_buffer_id = context_vk->current_command_buffer.id;
-}
-
-static inline void wined3d_context_vk_reference_texture(const struct wined3d_context_vk *context_vk,
-        struct wined3d_texture_vk *texture_vk)
-{
-    wined3d_context_vk_reference_image(context_vk, &texture_vk->image);
-}
-
-static inline void wined3d_context_vk_reference_resource(const struct wined3d_context_vk *context_vk,
-        struct wined3d_resource *resource)
-{
-    if (resource->type == WINED3D_RTYPE_BUFFER)
-        wined3d_context_vk_reference_bo(context_vk, wined3d_bo_vk(buffer_from_resource(resource)->buffer_object));
-    else
-        wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource)));
-}
-
-static inline void wined3d_context_vk_reference_query(const struct wined3d_context_vk *context_vk,
-        struct wined3d_query_vk *query_vk)
-{
-    query_vk->command_buffer_id = context_vk->current_command_buffer.id;
-}
-
-static inline void wined3d_context_vk_reference_sampler(const struct wined3d_context_vk *context_vk,
-        struct wined3d_sampler_vk *sampler_vk)
-{
-    sampler_vk->command_buffer_id = context_vk->current_command_buffer.id;
-}
-
-static inline void wined3d_context_vk_reference_rendertarget_view(const struct wined3d_context_vk *context_vk,
-        struct wined3d_rendertarget_view_vk *rtv_vk)
-{
-    wined3d_context_vk_reference_resource(context_vk, rtv_vk->v.resource);
-    rtv_vk->command_buffer_id = context_vk->current_command_buffer.id;
-}
-
-static inline void wined3d_context_vk_reference_shader_resource_view(const struct wined3d_context_vk *context_vk,
-        struct wined3d_shader_resource_view_vk *srv_vk)
-{
-    wined3d_context_vk_reference_resource(context_vk, srv_vk->v.resource);
-    srv_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id;
-}
-
-static inline void wined3d_context_vk_reference_unordered_access_view(const struct wined3d_context_vk *context_vk,
-        struct wined3d_unordered_access_view_vk *uav_vk)
-{
-    wined3d_context_vk_reference_resource(context_vk, uav_vk->v.resource);
-    uav_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id;
-}
-
 static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv,
         const struct wined3d_format *srv_format)
 {
@@ -6077,6 +6014,8 @@ static inline bool isStateDirty(const struct wined3d_context *context, unsigned
     return wined3d_context_is_graphics_state_dirty(context, state_id);
 }

+#include "wined3d_vk.h"
+
 static inline VkImageAspectFlags vk_aspect_mask_from_format(const struct wined3d_format *format)
 {
     VkImageAspectFlags mask = 0;
diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h
index 9e24fbafd85..4ed77fcad53 100644
--- a/dlls/wined3d/wined3d_vk.h
+++ b/dlls/wined3d/wined3d_vk.h
@@ -26,6 +26,7 @@
 #include "wine/vulkan.h"

struct wined3d_buffer_vk;
+struct wined3d_context_vk;
 struct wined3d_device_vk;

#define VK_INSTANCE_FUNCS() \
@@ -1035,4 +1036,64 @@ static inline const struct wined3d_format_vk *wined3d_format_vk(const struct win
     return CONTAINING_RECORD(format, struct wined3d_format_vk, f);
 }

+static inline void wined3d_context_vk_reference_bo(const struct wined3d_context_vk *context_vk,
+        struct wined3d_bo_vk *bo)
+{
+    bo->command_buffer_id = context_vk->current_command_buffer.id;
+}
+
+static inline void wined3d_context_vk_reference_image(const struct wined3d_context_vk *context_vk,
+        struct wined3d_image_vk *image)
+{
+    image->command_buffer_id = context_vk->current_command_buffer.id;
+}
+
+static inline void wined3d_context_vk_reference_texture(const struct wined3d_context_vk *context_vk,
+        struct wined3d_texture_vk *texture_vk)
+{
+    wined3d_context_vk_reference_image(context_vk, &texture_vk->image);
+}
+
+static inline void wined3d_context_vk_reference_resource(const struct wined3d_context_vk *context_vk,
+        struct wined3d_resource *resource)
+{
+    if (resource->type == WINED3D_RTYPE_BUFFER)
+        wined3d_context_vk_reference_bo(context_vk, wined3d_bo_vk(buffer_from_resource(resource)->buffer_object));
+    else
+        wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource)));
+}
+
+static inline void wined3d_context_vk_reference_query(const struct wined3d_context_vk *context_vk,
+        struct wined3d_query_vk *query_vk)
+{
+    query_vk->command_buffer_id = context_vk->current_command_buffer.id;
+}
+
+static inline void wined3d_context_vk_reference_sampler(const struct wined3d_context_vk *context_vk,
+        struct wined3d_sampler_vk *sampler_vk)
+{
+    sampler_vk->command_buffer_id = context_vk->current_command_buffer.id;
+}
+
+static inline void wined3d_context_vk_reference_rendertarget_view(const struct wined3d_context_vk *context_vk,
+        struct wined3d_rendertarget_view_vk *rtv_vk)
+{
+    wined3d_context_vk_reference_resource(context_vk, rtv_vk->v.resource);
+    rtv_vk->command_buffer_id = context_vk->current_command_buffer.id;
+}
+
+static inline void wined3d_context_vk_reference_shader_resource_view(const struct wined3d_context_vk *context_vk,
+        struct wined3d_shader_resource_view_vk *srv_vk)
+{
+    wined3d_context_vk_reference_resource(context_vk, srv_vk->v.resource);
+    srv_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id;
+}
+
+static inline void wined3d_context_vk_reference_unordered_access_view(const struct wined3d_context_vk *context_vk,
+        struct wined3d_unordered_access_view_vk *uav_vk)
+{
+    wined3d_context_vk_reference_resource(context_vk, uav_vk->v.resource);
+    uav_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id;
+}
+
 #endif /* __WINE_WINED3D_VK */

[PATCH 5/6] wined3d: Move vk_aspect_mask_from_format() functions to wined3d_vk.h.

[Zebediah Figura]

From: Zebediah Figura

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

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index fd7d766a1a4..3034b947c00 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -6014,22 +6014,6 @@ static inline bool isStateDirty(const struct wined3d_context *context, unsigned
     return wined3d_context_is_graphics_state_dirty(context, state_id);
 }

-#include "wined3d_vk.h"
-
-static inline VkImageAspectFlags vk_aspect_mask_from_format(const struct wined3d_format *format)
-{
-    VkImageAspectFlags mask = 0;
-
-    if (format->depth_size)
-        mask |= VK_IMAGE_ASPECT_DEPTH_BIT;
-    if (format->stencil_size)
-        mask |= VK_IMAGE_ASPECT_STENCIL_BIT;
-    if (!mask || format->red_size || format->green_size || format->blue_size || format->alpha_size)
-        mask |= VK_IMAGE_ASPECT_COLOR_BIT;
-
-    return mask;
-}
-
 static inline bool wined3d_primitive_type_is_list(enum wined3d_primitive_type t)
 {
     return t == WINED3D_PT_POINTLIST
@@ -6064,4 +6048,6 @@ static inline bool wined3d_map_persistent(void)

extern CRITICAL_SECTION wined3d_command_cs;

+#include "wined3d_vk.h"
+
 #endif
diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h
index 4ed77fcad53..c44e8aa45b0 100644
--- a/dlls/wined3d/wined3d_vk.h
+++ b/dlls/wined3d/wined3d_vk.h
@@ -256,6 +256,20 @@ void wined3d_format_colour_to_vk(const struct wined3d_format *format, const stru
 void wined3d_vk_swizzle_from_color_fixup(VkComponentMapping *mapping, struct color_fixup_desc fixup) DECLSPEC_HIDDEN;
 const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN;

+static inline VkImageAspectFlags vk_aspect_mask_from_format(const struct wined3d_format *format)
+{
+    VkImageAspectFlags mask = 0;
+
+    if (format->depth_size)
+        mask |= VK_IMAGE_ASPECT_DEPTH_BIT;
+    if (format->stencil_size)
+        mask |= VK_IMAGE_ASPECT_STENCIL_BIT;
+    if (!mask || format->red_size || format->green_size || format->blue_size || format->alpha_size)
+        mask |= VK_IMAGE_ASPECT_COLOR_BIT;
+
+    return mask;
+}
+
 struct wined3d_bo_vk
 {
     struct wined3d_bo b;

[PATCH 6/6] wined3d: Move the wined3d_vk.h include to individual files.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/wined3d/adapter_vk.c      | 1 +
 dlls/wined3d/buffer.c          | 1 +
 dlls/wined3d/context_vk.c      | 1 +
 dlls/wined3d/device.c          | 1 +
 dlls/wined3d/query.c           | 1 +
 dlls/wined3d/resource.c        | 1 +
 dlls/wined3d/sampler.c         | 1 +
 dlls/wined3d/shader_spirv.c    | 1 +
 dlls/wined3d/swapchain.c       | 1 +
 dlls/wined3d/texture.c         | 1 +
 dlls/wined3d/utils.c           | 1 +
 dlls/wined3d/view.c            | 1 +
 dlls/wined3d/wined3d_main.c    | 2 ++
 dlls/wined3d/wined3d_private.h | 2 --
 dlls/wined3d/wined3d_vk.h      | 1 +
 15 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index 5b6042659aa..3dcf2230643 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -17,6 +17,7 @@
  */

#include "wined3d_private.h"
+#include "wined3d_vk.h"

WINE_DEFAULT_DEBUG_CHANNEL(d3d);

diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index fa24f006872..a3881438976 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -23,6 +23,7 @@
  */

#include "wined3d_private.h"
+#include "wined3d_vk.h"

WINE_DEFAULT_DEBUG_CHANNEL(d3d);

diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c
index 097f8c7032c..efc18e2ff69 100644
--- a/dlls/wined3d/context_vk.c
+++ b/dlls/wined3d/context_vk.c
@@ -23,6 +23,7 @@
  */

#include "wined3d_private.h"
+#include "wined3d_vk.h"

WINE_DEFAULT_DEBUG_CHANNEL(d3d);

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 6c9d7f4368c..deb6d3dc210 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -25,6 +25,7 @@
  */

#include "wined3d_private.h"
+#include "wined3d_vk.h"

WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index be739704922..8e5f60cc7fc 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -19,6 +19,7 @@
  */

#include "wined3d_private.h"
+#include "wined3d_vk.h"

WINE_DEFAULT_DEBUG_CHANNEL(d3d);

diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 471d2f32f03..6d4dbb75ef6 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -22,6 +22,7 @@
  */

#include "wined3d_private.h"
+#include "wined3d_vk.h"

WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c
index d6e19fc521c..e6c226af1af 100644
--- a/dlls/wined3d/sampler.c
+++ b/dlls/wined3d/sampler.c
@@ -18,6 +18,7 @@
  */

#include "wined3d_private.h"
+#include "wined3d_vk.h"

WINE_DEFAULT_DEBUG_CHANNEL(d3d);

diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c
index ad0a8f1b3e8..966721905a4 100644
--- a/dlls/wined3d/shader_spirv.c
+++ b/dlls/wined3d/shader_spirv.c
@@ -18,6 +18,7 @@
  */

#include "wined3d_private.h"
+#include "wined3d_vk.h"

WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);

diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index cad27d7e7ea..ac6f9ea6222 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -21,6 +21,7 @@
  */

#include "wined3d_private.h"
+#include "wined3d_vk.h"

WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 32923349c6b..78b1f52221c 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -21,6 +21,7 @@
  */

#include "wined3d_private.h"
+#include "wined3d_vk.h"

WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index e34be2996b1..3618490b1c7 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -27,6 +27,7 @@
 #include <stdio.h>

#include "wined3d_private.h"
+#include "wined3d_vk.h"

WINE_DEFAULT_DEBUG_CHANNEL(d3d);

diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index a95ff13410f..d318318d2b3 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -19,6 +19,7 @@

#include "wined3d_private.h"
 #include "wined3d_shaders.h"
+#include "wined3d_vk.h"

WINE_DEFAULT_DEBUG_CHANNEL(d3d);

diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 15c8e237af3..0ff215f7312 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -27,6 +27,8 @@
 #include "initguid.h"
 #include "wined3d_private.h"
 #include "d3d12.h"
+#define VK_NO_PROTOTYPES
+#include "wine/vulkan.h"
 #include <vkd3d.h>

WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 3034b947c00..6e2bdc8aaf1 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -6048,6 +6048,4 @@ static inline bool wined3d_map_persistent(void)

extern CRITICAL_SECTION wined3d_command_cs;

-#include "wined3d_vk.h"
-
 #endif
diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h
index c44e8aa45b0..170d0cc3a79 100644
--- a/dlls/wined3d/wined3d_vk.h
+++ b/dlls/wined3d/wined3d_vk.h
@@ -24,6 +24,7 @@
 #include "wine/wined3d.h"
 #define VK_NO_PROTOTYPES
 #include "wine/vulkan.h"
+#include "wined3d_private.h"

struct wined3d_buffer_vk;
 struct wined3d_context_vk;

[PATCH 0/6] MR3320: wined3d: Move Vulkan declarations to wined3d_vk.h, part 3/3. - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.