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

Commit dfe082f6 authored by Romain Guy's avatar Romain Guy
Browse files

Add more support for transformed clip rects and paths 

Change-Id: I41791b1e1bffef77d503dc9e52428395d2309688
parent fbb4321b

core/jni/android_view_GLES20Canvas.cpp

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

#include <SkiaShader.h>

#include <SkiaColorFilter.h>

#include <Stencil.h>

#include <Rect.h>



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



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

    return OpenGLRenderer::getStencilSize();

    return Stencil::getStencilSize();

}



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

libs/hwui/Android.mk

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

		SkiaShader.cpp \

		Snapshot.cpp \

		Stencil.cpp \

		TextureCache.cpp \

		TextDropShadowCache.cpp

libs/hwui/Caches.h

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

#include "FboCache.h"

#include "ResourceCache.h"

#include "Stencil.h"

#include "Dither.h"



namespace android {
@@ -252,10 +253,14 @@ 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);

    }



    glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);

    mMaxTextureSize = Caches::getInstance().maxTextureSize;



    mCache.setOnEntryRemovedListener(this);

}

libs/hwui/OpenGLRenderer.cpp

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

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



uint32_t OpenGLRenderer::getStencilSize() {

    return STENCIL_BUFFER_SIZE;

}



bool OpenGLRenderer::isDeferred() {

    return false;

}