diff options
| -rw-r--r-- | libs/graphicsenv/GraphicsEnv.cpp | 8 | ||||
| -rw-r--r-- | libs/graphicsenv/include/graphicsenv/GraphicsEnv.h | 3 | ||||
| -rw-r--r-- | opengl/libs/EGL/egl_layers.cpp | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp index 8661401021..97b4828e01 100644 --- a/libs/graphicsenv/GraphicsEnv.cpp +++ b/libs/graphicsenv/GraphicsEnv.cpp @@ -153,10 +153,18 @@ const std::string& GraphicsEnv::getDebugLayers() { return mDebugLayers; } +const std::string& GraphicsEnv::getDebugLayersGLES() { + return mDebugLayersGLES; +} + void GraphicsEnv::setDebugLayers(const std::string layers) { mDebugLayers = layers; } +void GraphicsEnv::setDebugLayersGLES(const std::string layers) { + mDebugLayersGLES = layers; +} + android_namespace_t* GraphicsEnv::getDriverNamespace() { static std::once_flag once; std::call_once(once, [this]() { diff --git a/libs/graphicsenv/include/graphicsenv/GraphicsEnv.h b/libs/graphicsenv/include/graphicsenv/GraphicsEnv.h index 10c2549227..528c260653 100644 --- a/libs/graphicsenv/include/graphicsenv/GraphicsEnv.h +++ b/libs/graphicsenv/include/graphicsenv/GraphicsEnv.h @@ -61,7 +61,9 @@ public: const std::string& getLayerPaths(); void setDebugLayers(const std::string layers); + void setDebugLayersGLES(const std::string layers); const std::string& getDebugLayers(); + const std::string& getDebugLayersGLES(); private: GraphicsEnv() = default; @@ -74,6 +76,7 @@ private: long mAngleRulesOffset; long mAngleRulesLength; std::string mDebugLayers; + std::string mDebugLayersGLES; std::string mLayerPaths; android_namespace_t* mDriverNamespace = nullptr; android_namespace_t* mAngleNamespace = nullptr; diff --git a/opengl/libs/EGL/egl_layers.cpp b/opengl/libs/EGL/egl_layers.cpp index e4906e08c4..dd8fbfcb7d 100644 --- a/opengl/libs/EGL/egl_layers.cpp +++ b/opengl/libs/EGL/egl_layers.cpp @@ -144,8 +144,8 @@ const char kSystemLayerLibraryDir[] = "/data/local/debug/gles"; std::string LayerLoader::GetDebugLayers() { // Layers can be specified at the Java level in GraphicsEnvironemnt - // gpu_debug_layers = layer1:layer2:layerN - std::string debug_layers = android::GraphicsEnv::getInstance().getDebugLayers(); + // gpu_debug_layers_gles = layer1:layer2:layerN + std::string debug_layers = android::GraphicsEnv::getInstance().getDebugLayersGLES(); if (debug_layers.empty()) { // Only check system properties if Java settings are empty |