summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-08-17 17:24:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-17 17:24:09 +0000
commit38bb97f6220ff112ce4d547a24807dcab904105e (patch)
tree8dc70cc810f668d18b6f1ae1d620a1005d9aab69
parentd03fcb8b5883e40bff291606d0975c5b1e0af720 (diff)
parentd711a75dca69270de2b0eafab958c2a12ed7bbbc (diff)
Merge "vulkan: avoid waiting for service.sf.present_timestamp creation" am: 2ea51b8478 am: 6f61f6578a am: d711a75dca
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1401796 Change-Id: Ibf7b648e6a049a1ed7faadeb06f36a32e2455619
-rw-r--r--vulkan/libvulkan/driver.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index 74ef0e7073..01cbf399ff 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -964,9 +964,7 @@ VkResult EnumerateDeviceExtensionProperties(
// 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});