diff options
| author | Romain Guy <romainguy@google.com> | 2011-05-26 16:55:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-26 16:55:33 -0700 |
| commit | 4686fb8ac8c88eb1f0d76fc4157be4cb5949e98e (patch) | |
| tree | c83b88b6916d96bb22b8640f3977129ed73cf395 | |
| parent | 24de44a1877be3e5d63697f90c98a87a4d88b1fb (diff) | |
| parent | e324197ecd14591d7db0572f50c0d21bbd269bb4 (diff) | |
| download | frameworks_base-4686fb8ac8c88eb1f0d76fc4157be4cb5949e98e.zip frameworks_base-4686fb8ac8c88eb1f0d76fc4157be4cb5949e98e.tar.gz frameworks_base-4686fb8ac8c88eb1f0d76fc4157be4cb5949e98e.tar.bz2 | |
Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2
| -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 d9d7d23..ffcae1c 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_ZERO }, + { SkXfermode::kClear_Mode, GL_ZERO, GL_ONE_MINUS_SRC_ALPHA }, { 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_ZERO, GL_ZERO }, + { SkXfermode::kClear_Mode, GL_ONE_MINUS_DST_ALPHA, 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 }, |