Merge "Add GLES specific setting for layers" (5011b595) · Commits · e / os / android_frameworks_native-old

libs/graphicsenv/GraphicsEnv.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -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]() {

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;

+2 −2

Original line number	Diff line number	Diff line
		@@ -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