Merge "Delete pre-glop path" (523735d8) · Commits · e / os / android_frameworks_base

libs/hwui/FontRenderer.cpp

+5 −75

Original line number	Diff line number	Diff line
		@@ -46,51 +46,11 @@ namespace uirenderer {
		// blur inputs smaller than this constant will bypass renderscript
		#define RS_MIN_INPUT_CUTOFF 10000

		#define USE_GLOPS true

		///////////////////////////////////////////////////////////////////////////////
		// TextSetupFunctor
		///////////////////////////////////////////////////////////////////////////////
		void TextSetupFunctor::setup(GLenum glyphFormat) {
		renderer->setupDraw();
		renderer->setupDrawTextGamma(paint);
		renderer->setupDrawDirtyRegionsDisabled();
		renderer->setupDrawWithTexture(glyphFormat == GL_ALPHA);
		switch (glyphFormat) {
		case GL_ALPHA: {
		renderer->setupDrawAlpha8Color(paint->getColor(), alpha);
		break;
		}
		case GL_RGBA: {
		float floatAlpha = alpha / 255.0f;
		renderer->setupDrawColor(floatAlpha, floatAlpha, floatAlpha, floatAlpha);
		break;
		}
		default: {
		#if DEBUG_FONT_RENDERER
		ALOGD("TextSetupFunctor: called with unknown glyph format %x", glyphFormat);
		#endif
		break;
		}
		}
		renderer->setupDrawColorFilter(paint->getColorFilter());
		renderer->setupDrawShader(paint->getShader());
		renderer->setupDrawBlending(paint);
		renderer->setupDrawProgram();
		renderer->setupDrawModelView(kModelViewMode_Translate, false,
		0.0f, 0.0f, 0.0f, 0.0f, pureTranslate);
		// Calling setupDrawTexture with the name 0 will enable the
		// uv attributes and increase the texture unit count
		// texture binding will be performed by the font renderer as
		// needed
		renderer->setupDrawTexture(0);
		renderer->setupDrawPureColorUniforms();
		renderer->setupDrawColorFilterUniforms(paint->getColorFilter());
		renderer->setupDrawShaderUniforms(paint->getShader(), pureTranslate);
		renderer->setupDrawTextGammaUniforms();
		}

		void TextSetupFunctor::draw(CacheTexture& texture, bool linearFiltering) {

		void TextDrawFunctor::draw(CacheTexture& texture, bool linearFiltering) {
		int textureFillFlags = static_cast<int>(texture.getFormat() == GL_ALPHA
		? TextureFillFlags::kIsAlphaMaskTexture : TextureFillFlags::kNone);
		if (linearFiltering) {
		@@ -508,11 +468,6 @@ void FontRenderer::checkTextureUpdate() {
		void FontRenderer::issueDrawCommand(Vector<CacheTexture*>& cacheTextures) {
		if (!mFunctor) return;

		#if !USE_GLOPS
		Caches& caches = mFunctor->renderer->getCaches();
		RenderState& renderState = mFunctor->renderer->renderState();
		#endif

		bool first = true;
		bool forceRebind = false;
		for (uint32_t i = 0; i < cacheTextures.size(); i++) {
		@@ -520,37 +475,12 @@ void FontRenderer::issueDrawCommand(Vector<CacheTexture*>& cacheTextures) {
		if (texture->canDraw()) {
		if (first) {
		checkTextureUpdate();
		#if !USE_GLOPS
		mFunctor->setup(texture->getFormat());

		renderState.meshState().bindQuadIndicesBuffer();

		// If returns true, a VBO was bound and we must
		// rebind our vertex attrib pointers even if
		// they have the same values as the current pointers
		forceRebind = renderState.meshState().unbindMeshBuffer();

		caches.textureState().activateTexture(0);
		#endif
		first = false;
		mDrawn = true;
		}
		#if USE_GLOPS
		mFunctor->draw(*texture, mLinearFiltering);
		#endif

		#if !USE_GLOPS
		caches.textureState().bindTexture(texture->getTextureId());
		texture->setLinearFiltering(mLinearFiltering);

		TextureVertex* mesh = texture->mesh();
		MeshState& meshState = renderState.meshState();
		meshState.bindPositionVertexPointer(forceRebind, &mesh[0].x);
		meshState.bindTexCoordsVertexPointer(forceRebind, &mesh[0].u);
		mFunctor->draw(*texture, mLinearFiltering);

		glDrawElements(GL_TRIANGLES, texture->meshElementCount(),
		GL_UNSIGNED_SHORT, texture->indices());
		#endif
		texture->resetMesh();
		forceRebind = false;
		}
		@@ -689,7 +619,7 @@ FontRenderer::DropShadow FontRenderer::renderDropShadow(const SkPaint* paint, co
		return image;
		}

		void FontRenderer::initRender(const Rect* clip, Rect* bounds, TextSetupFunctor* functor) {
		void FontRenderer::initRender(const Rect* clip, Rect* bounds, TextDrawFunctor* functor) {
		checkInit();

		mDrawn = false;
		@@ -717,7 +647,7 @@ void FontRenderer::endPrecaching() {

		bool FontRenderer::renderPosText(const SkPaint* paint, const Rect* clip, const char *text,
		uint32_t startIndex, uint32_t len, int numGlyphs, int x, int y,
		const float* positions, Rect* bounds, TextSetupFunctor* functor, bool forceFinish) {
		const float* positions, Rect* bounds, TextDrawFunctor* functor, bool forceFinish) {
		if (!mCurrentFont) {
		ALOGE("No font set");
		return false;
		@@ -735,7 +665,7 @@ bool FontRenderer::renderPosText(const SkPaint* paint, const Rect* clip, const c

		bool FontRenderer::renderTextOnPath(const SkPaint* paint, const Rect* clip, const char *text,
		uint32_t startIndex, uint32_t len, int numGlyphs, const SkPath* path,
		float hOffset, float vOffset, Rect* bounds, TextSetupFunctor* functor) {
		float hOffset, float vOffset, Rect* bounds, TextDrawFunctor* functor) {
		if (!mCurrentFont) {
		ALOGE("No font set");
		return false;

libs/hwui/FontRenderer.h

+6 −8

Original line number	Diff line number	Diff line
		@@ -46,9 +46,9 @@ namespace uirenderer {

		class OpenGLRenderer;

		class TextSetupFunctor {
		class TextDrawFunctor {
		public:
		TextSetupFunctor(OpenGLRenderer* renderer, float x, float y, bool pureTranslate,
		TextDrawFunctor(OpenGLRenderer* renderer, float x, float y, bool pureTranslate,
		int alpha, SkXfermode::Mode mode, const SkPaint* paint)
		: renderer(renderer)
		, x(x)
		@@ -59,8 +59,6 @@ public:
		, paint(paint) {
		}

		void setup(GLenum glyphFormat);

		void draw(CacheTexture& texture, bool linearFiltering);

		OpenGLRenderer* renderer;
		@@ -92,12 +90,12 @@ public:
		// bounds is an out parameter
		bool renderPosText(const SkPaint* paint, const Rect* clip, const char *text,
		uint32_t startIndex, uint32_t len, int numGlyphs, int x, int y, const float* positions,
		Rect* bounds, TextSetupFunctor* functor, bool forceFinish = true);
		Rect* bounds, TextDrawFunctor* functor, bool forceFinish = true);

		// bounds is an out parameter
		bool renderTextOnPath(const SkPaint* paint, const Rect* clip, const char *text,
		uint32_t startIndex, uint32_t len, int numGlyphs, const SkPath* path,
		float hOffset, float vOffset, Rect* bounds, TextSetupFunctor* functor);
		float hOffset, float vOffset, Rect* bounds, TextDrawFunctor* functor);

		struct DropShadow {
		uint32_t width;
		@@ -135,7 +133,7 @@ private:
		void flushAllAndInvalidate();

		void checkInit();
		void initRender(const Rect* clip, Rect* bounds, TextSetupFunctor* functor);
		void initRender(const Rect* clip, Rect* bounds, TextDrawFunctor* functor);
		void finishRender();

		void issueDrawCommand(Vector<CacheTexture*>& cacheTextures);
		@@ -176,7 +174,7 @@ private:

		bool mUploadTexture;

		TextSetupFunctor* mFunctor;
		TextDrawFunctor* mFunctor;
		const Rect* mClip;
		Rect* mBounds;
		bool mDrawn;

libs/hwui/GlopBuilder.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -586,6 +586,12 @@ void GlopBuilder::build() {
		mDescription.hasColors = mOutGlop->mesh.vertices.attribFlags & VertexAttribFlags::kColor;
		mDescription.hasVertexAlpha = mOutGlop->mesh.vertices.attribFlags & VertexAttribFlags::kAlpha;

		// Enable debug highlight when what we're about to draw is tested against
		// the stencil buffer and if stencil highlight debugging is on
		mDescription.hasDebugHighlight = !mCaches.debugOverdraw
		&& mCaches.debugStencilClip == Caches::kStencilShowHighlight
		&& mRenderState.stencil().isTestEnabled();

		// serialize shader info into ShaderData
		GLuint textureUnit = mOutGlop->fill.texture.texture ? 1 : 0;
		SkiaShader::store(mCaches, mShader, mOutGlop->transform.modelView,