OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

venus: tiny refactor of vn_android_get_gralloc_buffer_info

Browse Source 
Return false if the queried drm format modifier is invalid.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10960>
This commit is contained in:
Yiwei Zhang
2021-05-23 22:30:43 +00:00
committed by Marge Bot
parent b9ff51f750
commit c82e836490
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/virtio/vulkan/vn_android.c
View File

@@ -266,6 +266,9 @@ vn_android_get_gralloc_buffer_info(buffer_handle_t handle,
&info) != 0) &info) != 0)
return false; return false;
if (info.modifier == DRM_FORMAT_MOD_INVALID)
return false;
for (uint32_t i = 0; i < 4; i++) { for (uint32_t i = 0; i < 4; i++) {
out_strides[i] = info.stride[i]; out_strides[i] = info.stride[i];
out_offsets[i] = info.offset[i]; out_offsets[i] = info.offset[i];
@@ -357,8 +360,7 @@ vn_android_image_from_anb(struct vn_device *dev,
goto fail; goto fail;
if (!vn_android_get_gralloc_buffer_info(anb_info->handle, strides, offsets, if (!vn_android_get_gralloc_buffer_info(anb_info->handle, strides, offsets,
&format_modifier) || &format_modifier)) {
format_modifier == DRM_FORMAT_MOD_INVALID) {
result = VK_ERROR_INVALID_EXTERNAL_HANDLE; result = VK_ERROR_INVALID_EXTERNAL_HANDLE;
goto fail; goto fail;
} }
@@ -767,8 +769,7 @@ vn_android_get_ahb_format_properties(
uint64_t format_modifier = 0; uint64_t format_modifier = 0;
const native_handle_t *handle = AHardwareBuffer_getNativeHandle(ahb); const native_handle_t *handle = AHardwareBuffer_getNativeHandle(ahb);
if (!vn_android_get_gralloc_buffer_info(handle, strides, offsets, if (!vn_android_get_gralloc_buffer_info(handle, strides, offsets,
&format_modifier) || &format_modifier))
format_modifier == DRM_FORMAT_MOD_INVALID)
return VK_ERROR_INVALID_EXTERNAL_HANDLE; return VK_ERROR_INVALID_EXTERNAL_HANDLE;
VkDrmFormatModifierPropertiesEXT mod_props; VkDrmFormatModifierPropertiesEXT mod_props;