commit 9fafb86d8efe472d97c207b3109630ed25ef81a0
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Sep 13 13:05:31 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Sep 13 13:05:31 2021 +0000
tree 7436a747457fb4bc78daf8f0c5c3c858cb6fb072
parent 607e030a429edfed0d82426047c84c53845f0f7b
parent bb1541838d8eb2cdba492a9615f43dfb56d83af0

Snap for 7727353 from bb1541838d8eb2cdba492a9615f43dfb56d83af0 to mainline-tethering-release

Change-Id: I54b707bacc8c22299aba5e61c2889d98ae3ff956

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",