Module: wine Branch: master Commit: e7de5a45a90dba3cf0551065f7839d8bafce8cfb URL: https://gitlab.winehq.org/wine/wine/-/commit/e7de5a45a90dba3cf0551065f7839d8...
Author: Zebediah Figura zfigura@codeweavers.com Date: Thu Dec 22 15:31:44 2022 -0600
wined3d: Move struct wined3d_format_vk to wined3d_vk.h.
---
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 */
-
Alexandre Julliard