Cleanup (07adacf4) · Commits · e / os / android_frameworks_base

libs/hwui/Android.common.mk

+1 −3

Original line number	Diff line number	Diff line
		# getConfig in external/skia/include/core/SkBitmap.h is deprecated.
		# Allow Gnu extension: in-class initializer of static 'const float' member.
		LOCAL_CLANG_CFLAGS += \
		-Wno-unused-parameter \
		-Wno-deprecated-declarations \
		-Wno-gnu-static-float-init

		@@ -77,7 +76,6 @@ LOCAL_C_INCLUDES += \
		external/skia/src/core

		LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES
		LOCAL_CFLAGS += -Wno-unused-parameter
		LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libEGL libGLESv2 libskia libui libgui

		ifneq (false,$(ANDROID_ENABLE_RENDERSCRIPT))
		@@ -102,4 +100,4 @@ endif
		# Defaults for ATRACE_TAG and LOG_TAG for libhwui
		LOCAL_CFLAGS += -DATRACE_TAG=ATRACE_TAG_VIEW -DLOG_TAG=\"OpenGLRenderer\"

		LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
		No newline at end of file
		LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter -Wunused -Wunreachable-code

libs/hwui/DisplayList.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ class DrawRenderNodeOp;
		/**
		* Holds data used in the playback a tree of DisplayLists.
		*/
		class PlaybackStateStruct {
		struct PlaybackStateStruct {
		protected:
		PlaybackStateStruct(OpenGLRenderer& renderer, int replayFlags, LinearAllocator* allocator)
		: mRenderer(renderer)
		@@ -96,8 +96,7 @@ struct DeferStateStruct : public PlaybackStateStruct {
		DeferredDisplayList& mDeferredList;
		};

		class ReplayStateStruct : public PlaybackStateStruct {
		public:
		struct ReplayStateStruct : public PlaybackStateStruct {
		ReplayStateStruct(OpenGLRenderer& renderer, Rect& dirty, int replayFlags)
		: PlaybackStateStruct(renderer, replayFlags, &mReplayAllocator),
		mDirty(dirty) {}

libs/hwui/Interpolator.cpp

+0 −6

Original line number	Diff line number	Diff line
		@@ -14,12 +14,6 @@
		* limitations under the License.
		*/

		// LOG_TAG is being provided by the Makefile, reset.
		#ifdef LOG_TAG
		#undef LOG_TAG
		#endif
		#define LOG_TAG "Interpolator"

		#include "Interpolator.h"

		#include <cmath>

libs/hwui/LayerCache.cpp

+7 −17

Original line number	Diff line number	Diff line
		@@ -80,10 +80,8 @@ int LayerCache::LayerEntry::compare(const LayerCache::LayerEntry& lhs,

		void LayerCache::deleteLayer(Layer* layer) {
		if (layer) {
		if (kDebugLayers) {
		ALOGD("Destroying layer %dx%d, fbo %d", layer->getWidth(), layer->getHeight(),
		LAYER_LOGD("Destroying layer %dx%d, fbo %d", layer->getWidth(), layer->getHeight(),
		layer->getFbo());
		}
		mSize -= layer->getWidth() * layer->getHeight() * 4;
		layer->state = Layer::kState_DeletedFromCache;
		layer->decStrong(0);
		@@ -112,13 +110,9 @@ Layer* LayerCache::get(RenderState& renderState, const uint32_t width, const uin
		layer->state = Layer::kState_RemovedFromCache;
		mSize -= layer->getWidth() * layer->getHeight() * 4;

		if (kDebugLayers) {
		ALOGD("Reusing layer %dx%d", layer->getWidth(), layer->getHeight());
		}
		LAYER_LOGD("Reusing layer %dx%d", layer->getWidth(), layer->getHeight());
		} else {
		if (kDebugLayers) {
		ALOGD("Creating new layer %dx%d", entry.mWidth, entry.mHeight);
		}
		LAYER_LOGD("Creating new layer %dx%d", entry.mWidth, entry.mHeight);

		layer = new Layer(Layer::kType_DisplayList, renderState, entry.mWidth, entry.mHeight);
		layer->setBlend(true);
		@@ -143,11 +137,9 @@ void LayerCache::dump() {
		size_t size = mCache.size();
		for (size_t i = 0; i < size; i++) {
		const LayerEntry& entry = mCache.itemAt(i);
		if (kDebugLayers) {
		ALOGD(" Layer size %dx%d", entry.mWidth, entry.mHeight);
		}
		}
		}

		bool LayerCache::put(Layer* layer) {
		if (!layer->isCacheable()) return false;
		@@ -165,11 +157,9 @@ bool LayerCache::put(Layer* layer) {
		deleteLayer(victim);
		mCache.removeAt(position);

		if (kDebugLayers) {
		ALOGD(" Deleting layer %.2fx%.2f", victim->layer.getWidth(),
		LAYER_LOGD(" Deleting layer %.2fx%.2f", victim->layer.getWidth(),
		victim->layer.getHeight());
		}
		}

		layer->cancelDefer();

libs/hwui/LayerCache.h

+6 −3

Original line number	Diff line number	Diff line
		@@ -26,11 +26,14 @@ namespace uirenderer {

		class RenderState;

		// Debug
		///////////////////////////////////////////////////////////////////////////////
		// Defines
		///////////////////////////////////////////////////////////////////////////////

		#if DEBUG_LAYERS
		static const bool kDebugLayers = true;
		#define LAYER_LOGD(...) ALOGD(__VA_ARGS__)
		#else
		static const bool kDebugLayers = false;
		#define LAYER_LOGD(...)
		#endif

		///////////////////////////////////////////////////////////////////////////////