From: Zebediah Figura zfigura@codeweavers.com
--- 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 */