commit 3a022bbbaeaa14260d7350dae61f362d39cc747f
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 17 17:46:15 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 17 17:46:15 2020 +0000
tree 923e53f174f3f3e79e02cb661bd3262f11d205b7
parent 6271343fdc3fadd20ca0f9db9cb930e692ff551f
parent 17d1f9356242e33404ddd122a817733613e188ce

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

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

Change-Id: I29bea1b5bc183347433767393e38d50750a88cc0

vulkan/libvulkan/driver.cpp

diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index 997b332..4068a16 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -1029,9 +1029,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});