Commit 85869cb7 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

wined3d: Move struct wined3d_swapchain_vk to wined3d_vk.h.

parent 63df7fc6
...@@ -4995,36 +4995,6 @@ HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, ...@@ -4995,36 +4995,6 @@ HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl,
struct wined3d_swapchain_state_parent *state_parent, void *parent, struct wined3d_swapchain_state_parent *state_parent, void *parent,
const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; 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 * Utility function prototypes
*/ */
...@@ -5545,6 +5515,8 @@ struct wined3d_format ...@@ -5545,6 +5515,8 @@ struct wined3d_format
enum wined3d_format_id typeless_id; enum wined3d_format_id typeless_id;
}; };
#include "wined3d_vk.h"
const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *adapter, 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 format_id, unsigned int bind_flags) DECLSPEC_HIDDEN;
enum wined3d_format_id wined3d_get_typed_format_id(const struct wined3d_adapter *adapter, enum wined3d_format_id wined3d_get_typed_format_id(const struct wined3d_adapter *adapter,
......
...@@ -993,4 +993,32 @@ HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_vi ...@@ -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, 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_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 */ #endif /* __WINE_WINED3D_VK */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment