From 6148ccef6372e634ea4875b75419bfdc64e6b219 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Mon, 28 Nov 2022 22:29:11 +0000 Subject: [PATCH] venus: fix android wsi with global fencing disabled Fixes: b21e4a7990c ("venus: put android wsi on the sub-optimal path") Signed-off-by: Yiwei Zhang Part-of: --- src/virtio/vulkan/vn_android.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/virtio/vulkan/vn_android.c b/src/virtio/vulkan/vn_android.c index b38530a0d5c..a4066e41ac0 100644 --- a/src/virtio/vulkan/vn_android.c +++ b/src/virtio/vulkan/vn_android.c @@ -826,8 +826,9 @@ vn_QueueSignalReleaseImageANDROID(VkQueue _queue, struct vn_device *dev = queue->device; const VkAllocationCallbacks *alloc = &dev->base.base.alloc; const bool has_sync_fd_fence_export = - dev->physical_device->renderer_sync_fd_fence_features & - VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT; + dev->instance->experimental.globalFencing == VK_TRUE && + (dev->physical_device->renderer_sync_fd_fence_features & + VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT); VkDevice device = vn_device_to_handle(dev); VkPipelineStageFlags local_stage_masks[8]; VkPipelineStageFlags *stage_masks = local_stage_masks;