Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source 
Change-Id: I91ffb9c66697741116fdeaa31abdf6cfd79155df
This commit is contained in:
Chris Craik
2014-12-19 10:08:40 -08:00
parent 32328b5cec
commit 07adacf499
7 changed files with 19 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/Android.common.mk
View File

@@ -1,7 +1,6 @@
# 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
LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter -Wunused -Wunreachable-code

5
libs/hwui/DisplayList.h
View File

@@ -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) {}

6
libs/hwui/Interpolator.cpp
View File

@@ -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>

24
libs/hwui/LayerCache.cpp
View File

@@ -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->getFbo());
}
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,9 +137,7 @@ 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);
}
ALOGD(" Layer size %dx%d", entry.mWidth, entry.mHeight);
}
}
@@ -165,10 +157,8 @@ bool LayerCache::put(Layer* layer) {
deleteLayer(victim);
mCache.removeAt(position);
if (kDebugLayers) {
ALOGD(" Deleting layer %.2fx%.2f", victim->layer.getWidth(),
victim->layer.getHeight());
}
LAYER_LOGD(" Deleting layer %.2fx%.2f", victim->layer.getWidth(),
victim->layer.getHeight());
}
layer->cancelDefer();

9
libs/hwui/LayerCache.h
View File

@@ -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
///////////////////////////////////////////////////////////////////////////////

10
libs/hwui/OpenGLRenderer.cpp
View File

@@ -740,10 +740,8 @@ int OpenGLRenderer::saveLayerDeferred(float left, float top, float right, float
*/
bool OpenGLRenderer::createLayer(float left, float top, float right, float bottom,
const SkPaint* paint, int flags, const SkPath* convexMask) {
if (kDebugLayers) {
ALOGD("Requesting layer %.2fx%.2f", right - left, bottom - top);
ALOGD("Layer cache size = %d", mCaches.layerCache.getSize());
}
LAYER_LOGD("Requesting layer %.2fx%.2f", right - left, bottom - top);
LAYER_LOGD("Layer cache size = %d", mCaches.layerCache.getSize());
const bool fboLayer = flags & SkCanvas::kClipToLayer_SaveFlag;
@@ -921,9 +919,7 @@ void OpenGLRenderer::composeLayer(const Snapshot& removed, const Snapshot& resto
// Failing to add the layer to the cache should happen only if the layer is too large
layer->setConvexMask(NULL);
if (!mCaches.layerCache.put(layer)) {
if (kDebugLayers) {
ALOGD("Deleting layer");
}
LAYER_LOGD("Deleting layer");
layer->decStrong(0);
}
}

7
libs/hwui/renderthread/RenderTask.cpp
View File

@@ -14,15 +14,8 @@
* limitations under the License.
*/
// LOG_TAG is being provided by the Makefile, reset.
#ifdef LOG_TAG
#undef LOG_TAG
#endif
#define LOG_TAG "RenderTask"
#include "RenderTask.h"
#include <utils/Log.h>
#include <utils/Condition.h>
#include <utils/Mutex.h>