commit 17d1f9356242e33404ddd122a817733613e188ce
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 17 17:35:16 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 17 17:35:16 2020 +0000
tree adc00031734a237a0cd7f9cbf409d4cf417f0f3c
parent 94fa82e7c6451136c2bf9447c985ea4b2c8b77ec
parent 38bb97f6220ff112ce4d547a24807dcab904105e

Merge "vulkan: avoid waiting for service.sf.present_timestamp creation" am: 2ea51b8478 am: 6f61f6578a am: d711a75dca am: 38bb97f622

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1401796

Change-Id: Id1da8a1148b96ef335f80ab81e1c33363150e238

vulkan/libvulkan/driver.cpp

diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index 74ef0e7..01cbf39 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -964,9 +964,7 @@
 
     // conditionally add VK_GOOGLE_display_timing if present timestamps are
     // supported by the driver:
-    const std::string timestamp_property("service.sf.present_timestamp");
-    android::base::WaitForPropertyCreation(timestamp_property);
-    if (android::base::GetBoolProperty(timestamp_property, true)) {
+    if (android::base::GetBoolProperty("service.sf.present_timestamp", false)) {
         loader_extensions.push_back({
                 VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME,
                 VK_GOOGLE_DISPLAY_TIMING_SPEC_VERSION});