diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 9df0c5852189a..6c8f38d2fd9b0 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -2555,10 +2555,14 @@ void OpenGLRenderer::drawTextShadow(SkPaint* paint, const char* text, int bytesC glDrawArrays(GL_TRIANGLE_STRIP, 0, gMeshCount); } +bool OpenGLRenderer::canSkipText(const SkPaint* paint) const { + float alpha = (mDrawModifiers.mHasShadow ? 1.0f : paint->getAlpha()) * mSnapshot->alpha; + return alpha == 0.0f && getXfermode(paint->getXfermode()) == SkXfermode::kSrcOver_Mode; +} + status_t OpenGLRenderer::drawPosText(const char* text, int bytesCount, int count, const float* positions, SkPaint* paint) { - if (text == NULL || count == 0 || mSnapshot->isIgnored() || - (paint->getAlpha() * mSnapshot->alpha == 0 && paint->getXfermode() == NULL)) { + if (text == NULL || count == 0 || mSnapshot->isIgnored() || canSkipText(paint)) { return DrawGlInfo::kStatusDone; } @@ -2630,8 +2634,7 @@ status_t OpenGLRenderer::drawPosText(const char* text, int bytesCount, int count status_t OpenGLRenderer::drawText(const char* text, int bytesCount, int count, float x, float y, const float* positions, SkPaint* paint, float length) { - if (text == NULL || count == 0 || mSnapshot->isIgnored() || - (paint->getAlpha() * mSnapshot->alpha == 0 && paint->getXfermode() == NULL)) { + if (text == NULL || count == 0 || mSnapshot->isIgnored() || canSkipText(paint)) { return DrawGlInfo::kStatusDone; } @@ -2735,8 +2738,7 @@ status_t OpenGLRenderer::drawText(const char* text, int bytesCount, int count, status_t OpenGLRenderer::drawTextOnPath(const char* text, int bytesCount, int count, SkPath* path, float hOffset, float vOffset, SkPaint* paint) { - if (text == NULL || count == 0 || mSnapshot->isIgnored() || - (paint->getAlpha() == 0 && paint->getXfermode() == NULL)) { + if (text == NULL || count == 0 || mSnapshot->isIgnored() || canSkipText(paint)) { return DrawGlInfo::kStatusDone; } diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h index 9144a33e9b497..3f472649f1af5 100644 --- a/libs/hwui/OpenGLRenderer.h +++ b/libs/hwui/OpenGLRenderer.h @@ -778,6 +778,11 @@ private: */ void resetDrawTextureTexCoords(float u1, float v1, float u2, float v2); + /** + * Returns true if the specified paint will draw invisible text. + */ + bool canSkipText(const SkPaint* paint) const; + /** * Binds the specified texture. The texture unit must have been selected * prior to calling this method.