venus: drop drm_format_modifier tracking
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35810>
This commit is contained in:
@@ -419,7 +419,6 @@ vn_android_image_from_anb_internal(struct vn_device *dev,
|
||||
|
||||
img->wsi.is_wsi = true;
|
||||
img->wsi.tiling_override = builder.create.tiling;
|
||||
img->wsi.drm_format_modifier = builder.modifier.drmFormatModifier;
|
||||
|
||||
int dma_buf_fd = vn_android_gralloc_get_dma_buf_fd(anb_info->handle);
|
||||
if (dma_buf_fd < 0) {
|
||||
|
||||
@@ -74,8 +74,6 @@ struct vn_image {
|
||||
bool is_wsi;
|
||||
bool is_prime_blit_src;
|
||||
VkImageTiling tiling_override;
|
||||
/* valid when tiling is VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT */
|
||||
uint64_t drm_format_modifier;
|
||||
|
||||
struct vn_device_memory *memory;
|
||||
|
||||
|
||||
@@ -141,23 +141,6 @@ vn_wsi_create_image(struct vn_device *dev,
|
||||
img->wsi.is_prime_blit_src = wsi_info->blit_src;
|
||||
img->wsi.tiling_override = create_info->tiling;
|
||||
|
||||
if (create_info->tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) {
|
||||
VkDevice dev_handle = vn_device_to_handle(dev);
|
||||
VkImage img_handle = vn_image_to_handle(img);
|
||||
|
||||
VkImageDrmFormatModifierPropertiesEXT props = {
|
||||
.sType = VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT,
|
||||
};
|
||||
result = vn_GetImageDrmFormatModifierPropertiesEXT(dev_handle,
|
||||
img_handle, &props);
|
||||
if (result != VK_SUCCESS) {
|
||||
vn_DestroyImage(dev_handle, img_handle, alloc);
|
||||
return result;
|
||||
}
|
||||
|
||||
img->wsi.drm_format_modifier = props.drmFormatModifier;
|
||||
}
|
||||
|
||||
*out_img = img;
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user