Revert "Revert "Add more support for transformed clip rects and paths"" (0baaac5e) · Commits · e / os / android_frameworks_base

core/jni/android_view_GLES20Canvas.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -46,6 +46,7 @@
	#include <OpenGLRenderer.h>		#include <OpenGLRenderer.h>
	#include <SkiaShader.h>		#include <SkiaShader.h>
	#include <SkiaColorFilter.h>		#include <SkiaColorFilter.h>
			#include <Stencil.h>
	#include <Rect.h>		#include <Rect.h>

	#include <TextLayout.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) {		static jint android_view_GLES20Canvas_getStencilSize(JNIEnv* env, jobject clazz) {
	return OpenGLRenderer::getStencilSize();		return Stencil::getStencilSize();
	}		}

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ ifeq ($(USE_OPENGL_RENDERER),true)
	SkiaColorFilter.cpp \		SkiaColorFilter.cpp \
	SkiaShader.cpp \		SkiaShader.cpp \
	Snapshot.cpp \		Snapshot.cpp \
			Stencil.cpp \
	TextureCache.cpp \		TextureCache.cpp \
	TextDropShadowCache.cpp		TextDropShadowCache.cpp

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,6 +38,7 @@
	#include "TextDropShadowCache.h"		#include "TextDropShadowCache.h"
	#include "FboCache.h"		#include "FboCache.h"
	#include "ResourceCache.h"		#include "ResourceCache.h"
			#include "Stencil.h"
	#include "Dither.h"		#include "Dither.h"

	namespace android {		namespace android {
	@@ -252,10 +253,14 @@ public:
	TextDropShadowCache dropShadowCache;		TextDropShadowCache dropShadowCache;
	FboCache fboCache;		FboCache fboCache;
	ResourceCache resourceCache;		ResourceCache resourceCache;
	Dither dither;

	GammaFontRenderer* fontRenderer;		GammaFontRenderer* fontRenderer;

			Dither dither;
			#if STENCIL_BUFFER_SIZE
			Stencil stencil;
			#endif

	// Debug methods		// Debug methods
	PFNGLINSERTEVENTMARKEREXTPROC eventMark;		PFNGLINSERTEVENTMARKEREXTPROC eventMark;
	PFNGLPUSHGROUPMARKEREXTPROC startMark;		PFNGLPUSHGROUPMARKEREXTPROC startMark;

+0 −4

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

	uint32_t OpenGLRenderer::getStencilSize() {
	return STENCIL_BUFFER_SIZE;
	}

	bool OpenGLRenderer::isDeferred() {		bool OpenGLRenderer::isDeferred() {
	return false;		return false;
	}		}

+0 −6

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

	SkPaint* filterPaint(SkPaint* paint);		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		* Sets the alpha on the current snapshot. This alpha value will be modulated
	* with other alpha values when drawing primitives.		* with other alpha values when drawing primitives.