wined3d: Move vk_aspect_mask_from_format() functions to wined3d_vk.h.

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

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;