Commit 972a782f authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

wined3d: Move struct wined3d_image_vk to wined3d_vk.h.

parent 24ad12f3
...@@ -1714,8 +1714,6 @@ struct wined3d_bo_user ...@@ -1714,8 +1714,6 @@ struct wined3d_bo_user
bool valid; bool valid;
}; };
#include "wined3d_vk.h"
struct wined3d_bo_address struct wined3d_bo_address
{ {
struct wined3d_bo *buffer_object; struct wined3d_bo *buffer_object;
...@@ -1733,14 +1731,6 @@ static inline struct wined3d_const_bo_address *wined3d_const_bo_address(const st ...@@ -1733,14 +1731,6 @@ static inline struct wined3d_const_bo_address *wined3d_const_bo_address(const st
return (struct wined3d_const_bo_address *)data; return (struct wined3d_const_bo_address *)data;
} }
struct wined3d_image_vk
{
VkImage vk_image;
struct wined3d_allocator_block *memory;
VkDeviceMemory vk_memory;
uint64_t command_buffer_id;
};
struct wined3d_stream_info_element struct wined3d_stream_info_element
{ {
const struct wined3d_format *format; const struct wined3d_format *format;
...@@ -2106,6 +2096,8 @@ struct wined3d_pipeline_statistics_query ...@@ -2106,6 +2096,8 @@ struct wined3d_pipeline_statistics_query
#define WINED3D_QUERY_POOL_SIZE 256 #define WINED3D_QUERY_POOL_SIZE 256
#include "wined3d_vk.h"
struct wined3d_query_pool_vk struct wined3d_query_pool_vk
{ {
struct list entry; struct list entry;
......
...@@ -294,4 +294,12 @@ void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk, ...@@ -294,4 +294,12 @@ void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk,
void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk, void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk,
struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN;
struct wined3d_image_vk
{
VkImage vk_image;
struct wined3d_allocator_block *memory;
VkDeviceMemory vk_memory;
uint64_t command_buffer_id;
};
#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