diff options
| author | James Dong <jdong@google.com> | 2011-05-27 11:17:39 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2011-05-27 11:17:39 -0700 |
| commit | f1d8a30c95909a2c6405d45637f6ce95a21b57dd (patch) | |
| tree | efc3022a20889f7dee71b5ba670fc09de5230419 /libs | |
| parent | f128d5d49b95971d580b07dfdbeb513a0eb3d2df (diff) | |
| download | frameworks_base-f1d8a30c95909a2c6405d45637f6ce95a21b57dd.zip frameworks_base-f1d8a30c95909a2c6405d45637f6ce95a21b57dd.tar.gz frameworks_base-f1d8a30c95909a2c6405d45637f6ce95a21b57dd.tar.bz2 | |
Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
This reverts commit e324197ecd14591d7db0572f50c0d21bbd269bb4.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index ffcae1c..d9d7d23 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -63,7 +63,7 @@ struct Blender { // In this array, the index of each Blender equals the value of the first // entry. For instance, gBlends[1] == gBlends[SkXfermode::kSrc_Mode] static const Blender gBlends[] = { - { SkXfermode::kClear_Mode, GL_ZERO, GL_ONE_MINUS_SRC_ALPHA }, + { SkXfermode::kClear_Mode, GL_ZERO, GL_ZERO }, { SkXfermode::kSrc_Mode, GL_ONE, GL_ZERO }, { SkXfermode::kDst_Mode, GL_ZERO, GL_ONE }, { SkXfermode::kSrcOver_Mode, GL_ONE, GL_ONE_MINUS_SRC_ALPHA }, @@ -81,7 +81,7 @@ static const Blender gBlends[] = { // this array's SrcOver blending mode is actually DstOver. You can refer to // createLayer() for more information on the purpose of this array. static const Blender gBlendsSwap[] = { - { SkXfermode::kClear_Mode, GL_ONE_MINUS_DST_ALPHA, GL_ZERO }, + { SkXfermode::kClear_Mode, GL_ZERO, GL_ZERO }, { SkXfermode::kSrc_Mode, GL_ZERO, GL_ONE }, { SkXfermode::kDst_Mode, GL_ONE, GL_ZERO }, { SkXfermode::kSrcOver_Mode, GL_ONE_MINUS_DST_ALPHA, GL_ONE }, |