AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

venus: drop tiling_override tracking

Browse Source 
It used to serve 2 purposes:
1. aliased swapchain image
2. faked legacy scanout support

...and now can be cleaned up.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35810>
This commit is contained in:
Yiwei Zhang
2025-06-28 14:25:42 -07:00
committed by Marge Bot
parent a96d7cdbc0
commit d45b76c3cc
4 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/virtio/vulkan/vn_android.c
-1
View File
@@ -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) {
src/virtio/vulkan/vn_image.c
+4 -8
View File
@@ -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:
src/virtio/vulkan/vn_image.h
-1
View File
@@ -73,7 +73,6 @@ struct vn_image {
*/
bool is_wsi;
bool is_prime_blit_src;
VkImageTiling tiling_override;
struct vn_device_memory *memory;
src/virtio/vulkan/vn_wsi.c
-1
View File
@@ -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;