commit 7e6b767f6024fefd107ad788d6885dd64964540c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Sep 11 03:00:53 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Sep 11 03:00:53 2021 +0000
tree 7436a747457fb4bc78daf8f0c5c3c858cb6fb072
parent 37ee375a6d07598dc423dcc42ee4956a78df3912
parent 9ac406f93801ca691c791e3341dd194caf3104b0

Snap for 7723257 from 9ac406f93801ca691c791e3341dd194caf3104b0 to sc-qpr1-release

Change-Id: I3a20a882501eaad7107e3b0be997ba89de3d5962

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index b6efe1a..dd3a475 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -1331,7 +1331,11 @@
             "VK_KHR_image_format_list",
             "VK_KHR_sampler_ycbcr_conversion",
             "VK_KHR_shader_float16_int8",
+            // Timeline semaphores buggy in newer NVIDIA drivers
+            // (vkWaitSemaphoresKHR causes further vkCommandBuffer dispatches to deadlock)
+#ifndef VK_USE_PLATFORM_ANDROID_KHR
             "VK_KHR_timeline_semaphore",
+#endif
             "VK_AMD_gpu_shader_half_float",
             "VK_NV_shader_subgroup_partitioned",
             "VK_KHR_shader_subgroup_extended_types",