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

Commit 0baaac5e authored by Romain Guy's avatar Romain Guy
Browse files

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

This reverts commit a8557d21.

Change-Id: I36d4883d548fc47ba6c0b4a42012107d0d2f85a6
parent a8557d21

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

}

libs/hwui/OpenGLRenderer.h

+0 −6
Original line number Diff line number Diff line
@@ -207,12 +207,6 @@ public: 


    SkPaint* filterPaint(SkPaint* paint);



    /**

     * Returns the desired size for the stencil buffer. If the returned value

     * is 0, then no stencil buffer is required.

     */

    ANDROID_API static uint32_t getStencilSize();



    /**

     * Sets the alpha on the current snapshot. This alpha value will be modulated

     * with other alpha values when drawing primitives.