diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-28 00:38:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-28 00:38:47 +0000 |
| commit | 922bbd8a5a981e3442d3cd28b4ea53d30d3603ed (patch) | |
| tree | 7e953943049148e71a70274634c6ee050ace6df0 /vulkan | |
| parent | 72ff2f85c17793c4122ce3ce98c69b5b266d22f9 (diff) | |
| parent | 3e3e804adb31f0bb2cb90619cffda7eb27316f57 (diff) | |
| download | native-922bbd8a5a981e3442d3cd28b4ea53d30d3603ed.tar.gz | |
Merge "Change to using sysprop for libvulkan" into rvc-dev am: a02be27f6d am: 3e3e804adb
Change-Id: Ic9c022d9cf152739c64fc0324e53ae6d6fb9c391
Diffstat (limited to 'vulkan')
| -rw-r--r-- | vulkan/libvulkan/Android.bp | 2 | ||||
| -rw-r--r-- | vulkan/libvulkan/driver.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/vulkan/libvulkan/Android.bp b/vulkan/libvulkan/Android.bp index 018f2004cd..f69de1f324 100644 --- a/vulkan/libvulkan/Android.bp +++ b/vulkan/libvulkan/Android.bp @@ -79,6 +79,7 @@ cc_library_shared { "hwvulkan_headers", "libnativeloader-headers", "vulkan_headers", + "libsurfaceflinger_headers", ], export_header_lib_headers: ["vulkan_headers"], shared_libs: [ @@ -100,6 +101,7 @@ cc_library_shared { "libnativeloader_lazy", "libnativewindow", "android.hardware.graphics.common@1.0", + "libSurfaceFlingerProp", ], static_libs: ["libgrallocusage"], } diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp index 9f754a0e6e..22122a558c 100644 --- a/vulkan/libvulkan/driver.cpp +++ b/vulkan/libvulkan/driver.cpp @@ -23,9 +23,10 @@ #include <stdlib.h> #include <string.h> +#include <SurfaceFlingerProperties.h> +#include <android-base/properties.h> #include <android/dlext.h> #include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h> -#include <android-base/properties.h> #include <configstore/Utils.h> #include <cutils/properties.h> #include <graphicsenv/GraphicsEnv.h> @@ -959,9 +960,7 @@ VkResult EnumerateDeviceExtensionProperties( VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME, VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION}); - bool hdrBoardConfig = - getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::hasHDRDisplay>( - false); + bool hdrBoardConfig = android::sysprop::has_HDR_display(false); if (hdrBoardConfig) { loader_extensions.push_back({VK_EXT_HDR_METADATA_EXTENSION_NAME, VK_EXT_HDR_METADATA_SPEC_VERSION}); |