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

venus: use sharing_mode from common vk_image

Browse source 
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33757>
This commit is contained in:
Yiwei Zhang 2025-02-25 01:37:22 -08:00 • committed by Marge Bot
parent f9afd65695
commit 15777727c9
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/virtio/vulkan/vn_command_buffer.c
View file

@ -243,7 +243,7 @@ vn_cmd_fix_image_memory_barrier_common(const struct vn_image *img,
result.availability_op_needed = false;
result.external_acquire_unmodified = true;
if (img->sharing_mode == VK_SHARING_MODE_CONCURRENT) {
if (img->base.base.sharing_mode == VK_SHARING_MODE_CONCURRENT) {
*src_qfi = VK_QUEUE_FAMILY_FOREIGN_EXT;
*dst_qfi = VK_QUEUE_FAMILY_IGNORED;
} else if (*dst_qfi == *src_qfi || *dst_qfi == cmd_pool_qfi) {
@ -263,7 +263,7 @@ vn_cmd_fix_image_memory_barrier_common(const struct vn_image *img,
result.visibility_op_needed = false;
if (img->sharing_mode == VK_SHARING_MODE_CONCURRENT) {
if (img->base.base.sharing_mode == VK_SHARING_MODE_CONCURRENT) {
*src_qfi = VK_QUEUE_FAMILY_IGNORED;
*dst_qfi = VK_QUEUE_FAMILY_FOREIGN_EXT;
} else if (*src_qfi == *dst_qfi || *src_qfi == cmd_pool_qfi) {

2
src/virtio/vulkan/vn_image.c
View file

@ -472,8 +472,6 @@ vn_image_init(struct vn_device *dev,
VkImage image = vn_image_to_handle(img);
VkResult result = VK_SUCCESS;
img->sharing_mode = create_info->sharingMode;
/* Check if mem reqs in cache. If found, make async call */
uint8_t key[SHA1_DIGEST_LENGTH] = { 0 };
const bool cacheable = vn_image_get_image_reqs_key(dev, create_info, key);

2
src/virtio/vulkan/vn_image.h
View file

@ -58,8 +58,6 @@ struct vn_image_create_deferred_info {
struct vn_image {
struct vn_image_base base;
VkSharingMode sharing_mode;
struct vn_image_memory_requirements requirements[4];
/* For VK_ANDROID_external_memory_android_hardware_buffer, real image