fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: make HIC image transitions public

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35896>
This commit is contained in:
Mike Blumenkrantz 2025-07-02 10:32:49 -04:00 • committed by Marge Bot
parent 3db7628e4c
commit 5e98018e80
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/zink/zink_resource.c
View file

@ -164,8 +164,8 @@ zink_debug_mem_print_stats(struct zink_screen *screen)
simple_mtx_unlock(&screen->debug_mem_lock);
}
static void
image_hic_transition(struct zink_screen *screen, struct zink_resource *res, VkImageLayout layout)
void
zink_resource_image_hic_transition(struct zink_screen *screen, struct zink_resource *res, VkImageLayout layout)
{
VkHostImageLayoutTransitionInfoEXT t = {
VK_STRUCTURE_TYPE_HOST_IMAGE_LAYOUT_TRANSITION_INFO_EXT,
@ -1711,7 +1711,7 @@ resource_create(struct pipe_screen *pscreen,
/* immediately switch to GENERAL layout if possible to avoid extra sync */
if (res->obj->image && res->queue != VK_QUEUE_FAMILY_FOREIGN_EXT && (res->obj->vkusage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT) &&
screen->driver_workarounds.general_layout)
image_hic_transition(screen, res, VK_IMAGE_LAYOUT_GENERAL);
zink_resource_image_hic_transition(screen, res, VK_IMAGE_LAYOUT_GENERAL);
}
if (res->obj->exportable)
res->base.b.bind |= ZINK_BIND_DMABUF;
@ -2703,7 +2703,7 @@ zink_image_subdata(struct pipe_context *pctx,
/* only pre-transition uninit images to avoid thrashing */
if (change_layout)
image_hic_transition(screen, res, VK_IMAGE_LAYOUT_GENERAL);
zink_resource_image_hic_transition(screen, res, VK_IMAGE_LAYOUT_GENERAL);
VkMemoryToImageCopyEXT region = {
VK_STRUCTURE_TYPE_MEMORY_TO_IMAGE_COPY_EXT,
NULL,
@ -2729,7 +2729,7 @@ zink_image_subdata(struct pipe_context *pctx,
box->width == pres->width0 && box->height == pres->height0 &&
((is_arrayed && box->depth == pres->array_size) || (!is_arrayed && box->depth == pres->depth0))) {
/* assume full copy single-mip images use shader read access */
image_hic_transition(screen, res, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
zink_resource_image_hic_transition(screen, res, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
/* assume multi-mip where further subdata calls may happen */
}
/* make sure image is marked as having data */

3
src/gallium/drivers/zink/zink_resource.h
View file

@ -38,6 +38,9 @@
extern "C" {
#endif
void
zink_resource_image_hic_transition(struct zink_screen *screen, struct zink_resource *res, VkImageLayout layout);
bool
zink_screen_resource_init(struct pipe_screen *pscreen);