Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16b7dc9c authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Merge all shapes/paths caches to PathCache" into jb-mr2-dev

parents a35d380b c46d07a2

libs/hwui/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ ifeq ($(USE_OPENGL_RENDERER),true) 
		ProgramCache.cpp \

		RenderBufferCache.cpp \

		ResourceCache.cpp \

		ShapeCache.cpp \

		SkiaColorFilter.cpp \

		SkiaShader.cpp \

		Snapshot.cpp \

libs/hwui/Caches.cpp

+0 −20
Original line number Diff line number Diff line
@@ -224,16 +224,6 @@ void Caches::dumpMemoryUsage(String8 &log) { 
            gradientCache.getSize(), gradientCache.getMaxSize());

    log.appendFormat("  PathCache            %8d / %8d\n",

            pathCache.getSize(), pathCache.getMaxSize());

    log.appendFormat("  CircleShapeCache     %8d / %8d\n",

            circleShapeCache.getSize(), circleShapeCache.getMaxSize());

    log.appendFormat("  OvalShapeCache       %8d / %8d\n",

            ovalShapeCache.getSize(), ovalShapeCache.getMaxSize());

    log.appendFormat("  RoundRectShapeCache  %8d / %8d\n",

            roundRectShapeCache.getSize(), roundRectShapeCache.getMaxSize());

    log.appendFormat("  RectShapeCache       %8d / %8d\n",

            rectShapeCache.getSize(), rectShapeCache.getMaxSize());

    log.appendFormat("  ArcShapeCache        %8d / %8d\n",

            arcShapeCache.getSize(), arcShapeCache.getMaxSize());

    log.appendFormat("  TextDropShadowCache  %8d / %8d\n", dropShadowCache.getSize(),

            dropShadowCache.getMaxSize());

    for (uint32_t i = 0; i < fontRenderer->getFontRendererCount(); i++) {
@@ -253,11 +243,6 @@ void Caches::dumpMemoryUsage(String8 &log) { 
    total += gradientCache.getSize();

    total += pathCache.getSize();

    total += dropShadowCache.getSize();

    total += roundRectShapeCache.getSize();

    total += circleShapeCache.getSize();

    total += ovalShapeCache.getSize();

    total += rectShapeCache.getSize();

    total += arcShapeCache.getSize();

    for (uint32_t i = 0; i < fontRenderer->getFontRendererCount(); i++) {

        total += fontRenderer->getFontRendererSize(i);

    }
@@ -325,11 +310,6 @@ void Caches::flush(FlushMode mode) { 
            fontRenderer->flush();

            textureCache.flush();

            pathCache.clear();

            roundRectShapeCache.clear();

            circleShapeCache.clear();

            ovalShapeCache.clear();

            rectShapeCache.clear();

            arcShapeCache.clear();

            // fall through

        case kFlushMode_Layers:

            layerCache.clear();

libs/hwui/Caches.h

+0 −6
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include "GradientCache.h"

#include "PatchCache.h"

#include "ProgramCache.h"

#include "ShapeCache.h"

#include "PathCache.h"

#include "TextDropShadowCache.h"

#include "FboCache.h"
@@ -269,11 +268,6 @@ public: 
    GradientCache gradientCache;

    ProgramCache programCache;

    PathCache pathCache;

    RoundRectShapeCache roundRectShapeCache;

    CircleShapeCache circleShapeCache;

    OvalShapeCache ovalShapeCache;

    RectShapeCache rectShapeCache;

    ArcShapeCache arcShapeCache;

    PatchCache patchCache;

    TextDropShadowCache dropShadowCache;

    FboCache fboCache;

libs/hwui/Debug.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
#define DEBUG_PATCHES_EMPTY_VERTICES 0



// Turn on to display debug info about shapes

#define DEBUG_SHAPES 0

#define DEBUG_PATHS 0



// Turn on to display debug info about textures

#define DEBUG_TEXTURES 0

libs/hwui/DeferredDisplayList.cpp

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#define LOG_TAG "OpenGLRenderer"

#define ATRACE_TAG ATRACE_TAG_VIEW



#include <SkCanvas.h>



#include <utils/Trace.h>



#include "Debug.h"