[PATCH 4/6] wined3d: Get rid of the wined3d_resource_vk_barrier() helper.

Zebediah Figura zfigura at codeweavers.com
Mon Jul 19 22:23:26 CDT 2021


Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 dlls/wined3d/wined3d_private.h | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 7e31579945f..98cb1c9e2f7 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4987,15 +4987,6 @@ HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined
         const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data,
         void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;
 
-static inline void wined3d_resource_vk_barrier(struct wined3d_resource *resource,
-        struct wined3d_context_vk *context_vk, uint32_t bind_mask)
-{
-    if (resource->type == WINED3D_RTYPE_BUFFER)
-        wined3d_buffer_vk_barrier(wined3d_buffer_vk(buffer_from_resource(resource)), context_vk, bind_mask);
-    else
-        wined3d_texture_vk_barrier(wined3d_texture_vk(texture_from_resource(resource)), context_vk, bind_mask);
-}
-
 struct wined3d_rendertarget_view
 {
     LONG refcount;
@@ -5064,7 +5055,9 @@ static inline struct wined3d_rendertarget_view_vk *wined3d_rendertarget_view_vk(
 static inline void wined3d_rendertarget_view_vk_barrier(struct wined3d_rendertarget_view_vk *rtv_vk,
         struct wined3d_context_vk *context_vk, uint32_t bind_mask)
 {
-    wined3d_resource_vk_barrier(rtv_vk->v.resource, context_vk, bind_mask);
+    struct wined3d_texture_vk *texture_vk = wined3d_texture_vk(texture_from_resource(rtv_vk->v.resource));
+
+    wined3d_texture_vk_barrier(texture_vk, context_vk, bind_mask);
 }
 
 static inline VkImageView wined3d_rendertarget_view_vk_get_image_view(struct wined3d_rendertarget_view_vk *rtv_vk,
-- 
2.32.0




More information about the wine-devel mailing list