venus: use sharing_mode from common vk_image
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33757>
This commit is contained in:
@@ -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) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user