drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Text shadow alpha handling incorrect

Browse Source 
DO NOT MERGE

External bug: http://code.google.com/p/android/issues/detail?id=34879
This is a regression from ICS.

This CL also fixes a bug where a View's alpha would be applied twice.

Change-Id: I13a1546228f44d4c169259414b6fa103a6e4a0fa
This commit is contained in:
Romain Guy
2012-07-13 12:13:07 -07:00
parent 0f8e402e95
commit 0a386ffac0
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/hwui/OpenGLRenderer.cpp
View File

@ -1149,7 +1149,6 @@ void OpenGLRenderer::setupDrawColor(int color) {
void OpenGLRenderer::setupDrawColor(int color, int alpha) {
mColorA = alpha / 255.0f;
mColorA *= mSnapshot->alpha;
// Second divide of a by 255 is an optimization, allowing us to simply multiply
// the rgb values by a instead of also dividing by 255
const float a = mColorA / 255.0f;
@ -1181,15 +1180,6 @@ void OpenGLRenderer::setupDrawColor(float r, float g, float b, float a) {
mSetShaderColor = mDescription.setColor(r, g, b, a);
}
void OpenGLRenderer::setupDrawAlpha8Color(float r, float g, float b, float a) {
mColorA = a;
mColorR = r;
mColorG = g;
mColorB = b;
mColorSet = true;
mSetShaderColor = mDescription.setAlpha8Color(r, g, b, a);
}
void OpenGLRenderer::setupDrawShader() {
if (mShader) {
mShader->describe(mDescription, mCaches.extensions);
@ -1771,7 +1761,7 @@ void OpenGLRenderer::drawAARect(float left, float top, float right, float bottom
setupDraw();
setupDrawNoTexture();
setupDrawAALine();
setupDrawColor(color);
setupDrawColor(color, ((color >> 24) & 0xFF) * mSnapshot->alpha);
setupDrawColorFilter();
setupDrawShader();
setupDrawBlending(true, mode);
@ -2267,7 +2257,7 @@ status_t OpenGLRenderer::drawRect(float left, float top, float right, float bott
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() == 0 && paint->getXfermode() == NULL)) {
(paint->getAlpha() * mSnapshot->alpha == 0 && paint->getXfermode() == NULL)) {
return DrawGlInfo::kStatusDone;
}
@ -2340,7 +2330,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, SkPaint* paint, float length) {
if (text == NULL || count == 0 || mSnapshot->isIgnored() ||
(paint->getAlpha() == 0 && paint->getXfermode() == NULL)) {
(paint->getAlpha() * mSnapshot->alpha == 0 && paint->getXfermode() == NULL)) {
return DrawGlInfo::kStatusDone;
}
@ -2393,7 +2383,7 @@ status_t OpenGLRenderer::drawText(const char* text, int bytesCount, int count,
const float sx = oldX - shadow->left + mShadowDx;
const float sy = oldY - shadow->top + mShadowDy;
const int shadowAlpha = ((mShadowColor >> 24) & 0xFF);
const int shadowAlpha = ((mShadowColor >> 24) & 0xFF) * mSnapshot->alpha;
int shadowColor = mShadowColor;
if (mShader) {
shadowColor = 0xffffffff;
@ -2792,7 +2782,7 @@ void OpenGLRenderer::drawColorRect(float left, float top, float right, float bot
setupDraw();
setupDrawNoTexture();
setupDrawColor(color);
setupDrawColor(color, ((color >> 24) & 0xFF) * mSnapshot->alpha);
setupDrawShader();
setupDrawColorFilter();
setupDrawBlending(mode);

1
libs/hwui/OpenGLRenderer.h
View File

@ -537,7 +537,6 @@ private:
void setupDrawColor(int color, int alpha);
void setupDrawColor(float r, float g, float b, float a);
void setupDrawAlpha8Color(int color, int alpha);
void setupDrawAlpha8Color(float r, float g, float b, float a);
void setupDrawShader();
void setupDrawColorFilter();
void setupDrawBlending(SkXfermode::Mode mode = SkXfermode::kSrcOver_Mode,