diff --git a/src/virtio/vulkan/vn_android.c b/src/virtio/vulkan/vn_android.c index fe36dca767a..c81b0b45879 100644 --- a/src/virtio/vulkan/vn_android.c +++ b/src/virtio/vulkan/vn_android.c @@ -418,7 +418,6 @@ vn_android_image_from_anb_internal(struct vn_device *dev, } img->wsi.is_wsi = true; - img->wsi.tiling_override = builder.create.tiling; int dma_buf_fd = vn_android_gralloc_get_dma_buf_fd(anb_info->handle); if (dma_buf_fd < 0) { diff --git a/src/virtio/vulkan/vn_image.c b/src/virtio/vulkan/vn_image.c index a3c51d0bcf3..457b316d7bc 100644 --- a/src/virtio/vulkan/vn_image.c +++ b/src/virtio/vulkan/vn_image.c @@ -881,11 +881,9 @@ vn_GetImageSubresourceLayout(VkDevice device, struct vn_device *dev = vn_device_from_handle(device); struct vn_image *img = vn_image_from_handle(image); - /* override aspect mask for wsi/ahb images with tiling modifier */ + /* override aspect mask for ahb images with tiling modifier */ VkImageSubresource local_subresource; - if ((img->wsi.is_wsi && img->wsi.tiling_override == - VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) || - img->deferred_info) { + if (img->deferred_info) { VkImageAspectFlags aspect = pSubresource->aspectMask; switch (aspect) { case VK_IMAGE_ASPECT_COLOR_BIT: @@ -1196,11 +1194,9 @@ vn_GetImageSubresourceLayout2(VkDevice device, struct vn_device *dev = vn_device_from_handle(device); struct vn_image *img = vn_image_from_handle(image); - /* override aspect mask for wsi/ahb images with tiling modifier */ + /* override aspect mask for ahb images with tiling modifier */ VkImageSubresource2 local_subresource; - if ((img->wsi.is_wsi && img->wsi.tiling_override == - VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) || - img->deferred_info) { + if (img->deferred_info) { VkImageAspectFlags aspect = pSubresource->imageSubresource.aspectMask; switch (aspect) { case VK_IMAGE_ASPECT_COLOR_BIT: diff --git a/src/virtio/vulkan/vn_image.h b/src/virtio/vulkan/vn_image.h index be4dcc12777..921ebd526da 100644 --- a/src/virtio/vulkan/vn_image.h +++ b/src/virtio/vulkan/vn_image.h @@ -73,7 +73,6 @@ struct vn_image { */ bool is_wsi; bool is_prime_blit_src; - VkImageTiling tiling_override; struct vn_device_memory *memory; diff --git a/src/virtio/vulkan/vn_wsi.c b/src/virtio/vulkan/vn_wsi.c index 6aa3d184f3d..3fa75f72112 100644 --- a/src/virtio/vulkan/vn_wsi.c +++ b/src/virtio/vulkan/vn_wsi.c @@ -139,7 +139,6 @@ vn_wsi_create_image(struct vn_device *dev, img->wsi.is_wsi = true; img->wsi.is_prime_blit_src = wsi_info->blit_src; - img->wsi.tiling_override = create_info->tiling; *out_img = img; return VK_SUCCESS;