diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 18:37:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 18:37:57 +0000 |
| commit | a046c9652a1937ace04734c1b5fcb96b99b564d4 (patch) | |
| tree | 4714753d665dd9b45375b9ea05bd85488228e169 /vulkan | |
| parent | bde12ab468028a240d94551b3ea26a4cb72e8537 (diff) | |
| parent | fe62271bc355a6989a3e093bd39afb7b2e249054 (diff) | |
| download | native-a046c9652a1937ace04734c1b5fcb96b99b564d4.tar.gz | |
GraphicsEnv: refactor to unify the debuggable logic am: fe62271bc3
Change-Id: I2bb295fbf56168beefa5dd26ea21cb85a90a6752
Diffstat (limited to 'vulkan')
| -rw-r--r-- | vulkan/libvulkan/api.cpp | 6 | ||||
| -rw-r--r-- | vulkan/libvulkan/driver.cpp | 4 | ||||
| -rw-r--r-- | vulkan/libvulkan/driver.h | 1 | ||||
| -rw-r--r-- | vulkan/libvulkan/layers_extensions.cpp | 3 |
4 files changed, 5 insertions, 9 deletions
diff --git a/vulkan/libvulkan/api.cpp b/vulkan/libvulkan/api.cpp index 3d56656896..f8263dbb93 100644 --- a/vulkan/libvulkan/api.cpp +++ b/vulkan/libvulkan/api.cpp @@ -124,7 +124,8 @@ class OverrideLayerNames { }; void AddImplicitLayers() { - if (!is_instance_ || !driver::Debuggable()) + if (!is_instance_ || + !android::GraphicsEnv::getInstance().isDebuggable()) return; GetLayersFromSettings(); @@ -370,7 +371,8 @@ class OverrideExtensionNames { private: bool EnableDebugCallback() const { - return (is_instance_ && driver::Debuggable() && + return (is_instance_ && + android::GraphicsEnv::getInstance().isDebuggable() && property_get_bool("debug.vulkan.enable_callback", false)); } diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp index 74773517ae..73ba92c13f 100644 --- a/vulkan/libvulkan/driver.cpp +++ b/vulkan/libvulkan/driver.cpp @@ -755,10 +755,6 @@ void FreeDeviceData(DeviceData* data, const VkAllocationCallbacks& allocator) { } // anonymous namespace -bool Debuggable() { - return (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) >= 0); -} - bool OpenHAL() { return Hal::Open(); } diff --git a/vulkan/libvulkan/driver.h b/vulkan/libvulkan/driver.h index 047a27adc9..ffe2a8bfe9 100644 --- a/vulkan/libvulkan/driver.h +++ b/vulkan/libvulkan/driver.h @@ -101,7 +101,6 @@ struct DeviceData { uint32_t driver_version; }; -bool Debuggable(); bool OpenHAL(); const VkAllocationCallbacks& GetDefaultAllocator(); diff --git a/vulkan/libvulkan/layers_extensions.cpp b/vulkan/libvulkan/layers_extensions.cpp index dd917393d1..7326692490 100644 --- a/vulkan/libvulkan/layers_extensions.cpp +++ b/vulkan/libvulkan/layers_extensions.cpp @@ -462,8 +462,7 @@ void* GetLayerGetProcAddr(const Layer& layer, void DiscoverLayers() { ATRACE_CALL(); - if (property_get_bool("ro.debuggable", false) && - prctl(PR_GET_DUMPABLE, 0, 0, 0, 0)) { + if (android::GraphicsEnv::getInstance().isDebuggable()) { DiscoverLayersInPathList(kSystemLayerLibraryDir); } if (!android::GraphicsEnv::getInstance().getLayerPaths().empty()) |