| commit | bb1541838d8eb2cdba492a9615f43dfb56d83af0 | [log] [tgz] |
|---|---|---|
| author | Lingfeng Yang <lfy@google.com> | Fri Sep 10 22:06:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 10 22:06:43 2021 +0000 |
| tree | 7436a747457fb4bc78daf8f0c5c3c858cb6fb072 | |
| parent | b68ebf303217343140f1f24a830275196efb2d16 [diff] | |
| parent | 9ef858e49b3ad535b2b17954541272ca205a0469 [diff] |
Disable timeline semaphores for now on Android am: 9ef858e49b Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/15805525 Change-Id: I06795817f91abebb698cf5fc7d3273677afd7feb
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",