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

Commit a8557d21 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

Revert "Add more support for transformed clip rects and paths" 

this introduced a dead lock in GradientCache's ctor.

This reverts commit dfe082f6.

Bug: 7096001
Change-Id: I57b8bbab11fb7cb502fa58e3bbf5d19864db874f
parent 703bd326

core/jni/android_view_GLES20Canvas.cpp

+1 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include <OpenGLRenderer.h>

#include <SkiaShader.h>

#include <SkiaColorFilter.h>

#include <Stencil.h>

#include <Rect.h>



#include <TextLayout.h>
@@ -151,7 +150,7 @@ static void android_view_GLES20Canvas_finish(JNIEnv* env, jobject clazz, 
}



static jint android_view_GLES20Canvas_getStencilSize(JNIEnv* env, jobject clazz) {

    return Stencil::getStencilSize();

    return OpenGLRenderer::getStencilSize();

}



// ----------------------------------------------------------------------------

libs/hwui/Android.mk

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

		SkiaShader.cpp \

		Snapshot.cpp \

		Stencil.cpp \

		TextureCache.cpp \

		TextDropShadowCache.cpp

libs/hwui/Caches.h

+1 −6
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include "TextDropShadowCache.h"

#include "FboCache.h"

#include "ResourceCache.h"

#include "Stencil.h"

#include "Dither.h"



namespace android {
@@ -253,14 +252,10 @@ public: 
    TextDropShadowCache dropShadowCache;

    FboCache fboCache;

    ResourceCache resourceCache;

    Dither dither;



    GammaFontRenderer* fontRenderer;



    Dither dither;

#if STENCIL_BUFFER_SIZE

    Stencil stencil;

#endif



    // Debug methods

    PFNGLINSERTEVENTMARKEREXTPROC eventMark;

    PFNGLPUSHGROUPMARKEREXTPROC startMark;

libs/hwui/GradientCache.cpp

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ GradientCache::GradientCache(): 
        INIT_LOGD("  Using default gradient cache size of %.2fMB", DEFAULT_GRADIENT_CACHE_SIZE);

    }



    mMaxTextureSize = Caches::getInstance().maxTextureSize;

    glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);



    mCache.setOnEntryRemovedListener(this);

}

libs/hwui/OpenGLRenderer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -139,6 +139,10 @@ void OpenGLRenderer::endMark() const { 
// Setup

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



uint32_t OpenGLRenderer::getStencilSize() {

    return STENCIL_BUFFER_SIZE;

}



bool OpenGLRenderer::isDeferred() {

    return false;

}