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

Commit 8cafcc62 authored by Mike Reed's avatar Mike Reed
Browse files

remove (dead) caches from hwui 

Test: make

Change-Id: I18bfe51896672272ce7d471eaead69b651399368
parent bb6d6d3f

core/jni/android/graphics/Graphics.cpp

+0 −3
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
#include <cutils/ashmem.h>

#include <hwui/Canvas.h>



#include <Caches.h>

#include <TextureCache.h>



using namespace android;



void doThrowNPE(JNIEnv* env) {

core/jni/android/graphics/Path.cpp

+0 −5
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include "SkPathOps.h"

#include "SkGeometry.h" // WARNING: Internal Skia Header



#include <Caches.h>

#include <vector>

#include <map>
@@ -38,10 +37,6 @@ class SkPathGlue { 
public:



    static void finalizer(SkPath* obj) {

        // Purge entries from the HWUI path cache if this path's data is unique

        if (obj->unique() && android::uirenderer::Caches::hasInstance()) {

            android::uirenderer::Caches::getInstance().pathCache.removeDeferred(obj);

        }

        delete obj;

    }

libs/hwui/Android.bp

+0 −9
Original line number Diff line number Diff line
@@ -211,14 +211,12 @@ cc_defaults { 
        "DeferredLayerUpdater.cpp",

        "DeviceInfo.cpp",

        "DisplayList.cpp",

        "FboCache.cpp",

        "FrameBuilder.cpp",

        "FrameInfo.cpp",

        "FrameInfoVisualizer.cpp",

        "GlLayer.cpp",

        "GlopBuilder.cpp",

        "GpuMemoryTracker.cpp",

        "GradientCache.cpp",

        "Image.cpp",

        "Interpolator.cpp",

        "JankTracker.cpp",
@@ -229,8 +227,6 @@ cc_defaults { 
        "OpDumper.cpp",

        "EglReadback.cpp",

        "Patch.cpp",

        "PatchCache.cpp",

        "PathCache.cpp",

        "PathParser.cpp",

        "PathTessellator.cpp",

        "PixelBuffer.cpp",
@@ -238,12 +234,10 @@ cc_defaults { 
        "ProfileDataContainer.cpp",

        "ProfileRenderer.cpp",

        "Program.cpp",

        "ProgramCache.cpp",

        "Properties.cpp",

        "PropertyValuesAnimatorSet.cpp",

        "PropertyValuesHolder.cpp",

        "RecordingCanvas.cpp",

        "RenderBufferCache.cpp",

        "RenderNode.cpp",

        "RenderProperties.cpp",

        "ResourceCache.cpp",
@@ -253,9 +247,7 @@ cc_defaults { 
        "SkiaShader.cpp",

        "Snapshot.cpp",

        "SpotShadow.cpp",

        "TessellationCache.cpp",

        "Texture.cpp",

        "TextureCache.cpp",

        "VectorDrawable.cpp",

        "VkLayer.cpp",

        "protos/graphicsstats.proto",
@@ -411,7 +403,6 @@ cc_benchmark { 
        "tests/microbench/LinearAllocatorBench.cpp",

        "tests/microbench/PathParserBench.cpp",

        "tests/microbench/RenderNodeBench.cpp",

        "tests/microbench/ShadowBench.cpp",

        "tests/microbench/TaskManagerBench.cpp",

    ],

}

libs/hwui/BakedOpDispatcher.cpp

+9 −389

File changed.

Preview size limit exceeded, changes collapsed.

libs/hwui/BakedOpRenderer.cpp

+2 −11
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ void BakedOpRenderer::endLayer() { 
        // if stencil was used for clipping, detach it and return it to pool

        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, 0);

        GL_CHECKPOINT(MODERATE);

        mCaches.renderBufferCache.put(mRenderTarget.stencil);

        mRenderTarget.stencil = nullptr;

    }

    mRenderTarget.lastStencilClip = nullptr;
@@ -182,7 +181,7 @@ void BakedOpRenderer::clearColorBuffer(const Rect& rect) { 
}



Texture* BakedOpRenderer::getTexture(Bitmap* bitmap) {

    return mCaches.textureCache.get(bitmap);

    return nullptr;

}



void BakedOpRenderer::drawRects(const float* rects, int count, const SkPaint* paint) {
@@ -304,15 +303,7 @@ void BakedOpRenderer::prepareRender(const Rect* dirtyBounds, const ClipBase* cli 
                // Stencil needed, but current stencil isn't up to date

                mRenderTarget.lastStencilClip = clip;



                if (mRenderTarget.frameBufferId != 0 && !mRenderTarget.stencil) {

                    OffscreenBuffer* layer = mRenderTarget.offscreenBuffer;

                    mRenderTarget.stencil = mCaches.renderBufferCache.get(

                            Stencil::getLayerStencilFormat(), layer->texture.width(),

                            layer->texture.height());

                    // stencil is bound + allocated - associate it with current FBO

                    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,

                                              GL_RENDERBUFFER, mRenderTarget.stencil->getName());

                }

                // DEAD CODE



                if (clip->mode == ClipMode::RectangleList) {

                    setupStencilRectList(clip);