OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: make image barrier init functions void return

Browse Source 
the return value was never used

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24886>
This commit is contained in:
Mike Blumenkrantz
2023-08-24 10:50:53 -04:00
committed by Marge Bot
parent 43be9a867e
commit 4d0e975a81
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/zink/zink_context.h
View File

@@ -120,7 +120,7 @@ void
zink_resource_buffer_barrier2(struct zink_context *ctx, struct zink_resource *res, VkAccessFlags flags, VkPipelineStageFlags pipeline); zink_resource_buffer_barrier2(struct zink_context *ctx, struct zink_resource *res, VkAccessFlags flags, VkPipelineStageFlags pipeline);
bool bool
zink_resource_image_needs_barrier(struct zink_resource *res, VkImageLayout new_layout, VkAccessFlags flags, VkPipelineStageFlags pipeline); zink_resource_image_needs_barrier(struct zink_resource *res, VkImageLayout new_layout, VkAccessFlags flags, VkPipelineStageFlags pipeline);
bool void
zink_resource_image_barrier_init(VkImageMemoryBarrier *imb, struct zink_resource *res, VkImageLayout new_layout, VkAccessFlags flags, VkPipelineStageFlags pipeline); zink_resource_image_barrier_init(VkImageMemoryBarrier *imb, struct zink_resource *res, VkImageLayout new_layout, VkAccessFlags flags, VkPipelineStageFlags pipeline);
void void
zink_resource_image_barrier(struct zink_context *ctx, struct zink_resource *res, zink_resource_image_barrier(struct zink_context *ctx, struct zink_resource *res,

6
src/gallium/drivers/zink/zink_synchronization.cpp
View File

@@ -172,7 +172,7 @@ zink_resource_image_needs_barrier(struct zink_resource *res, VkImageLayout new_l
zink_resource_access_is_write(flags); zink_resource_access_is_write(flags);
} }
bool void
zink_resource_image_barrier_init(VkImageMemoryBarrier *imb, struct zink_resource *res, VkImageLayout new_layout, VkAccessFlags flags, VkPipelineStageFlags pipeline) zink_resource_image_barrier_init(VkImageMemoryBarrier *imb, struct zink_resource *res, VkImageLayout new_layout, VkAccessFlags flags, VkPipelineStageFlags pipeline)
{ {
if (!pipeline) if (!pipeline)
@@ -197,10 +197,9 @@ zink_resource_image_barrier_init(VkImageMemoryBarrier *imb, struct zink_resource
res->obj->image, res->obj->image,
isr isr
}; };
return res->obj->needs_zs_evaluate || zink_resource_image_needs_barrier(res, new_layout, flags, pipeline);
} }
static bool static void
zink_resource_image_barrier2_init(VkImageMemoryBarrier2 *imb, struct zink_resource *res, VkImageLayout new_layout, VkAccessFlags flags, VkPipelineStageFlags pipeline) zink_resource_image_barrier2_init(VkImageMemoryBarrier2 *imb, struct zink_resource *res, VkImageLayout new_layout, VkAccessFlags flags, VkPipelineStageFlags pipeline)
{ {
if (!pipeline) if (!pipeline)
@@ -227,7 +226,6 @@ zink_resource_image_barrier2_init(VkImageMemoryBarrier2 *imb, struct zink_resour
res->obj->image, res->obj->image,
isr isr
}; };
return res->obj->needs_zs_evaluate || zink_resource_image_needs_barrier(res, new_layout, flags, pipeline);
} }
static inline bool static inline bool