diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-05-16 13:09:42 -0400 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2011-05-16 15:30:40 -0400 |
| commit | d39d1affe82cb8c21d32baaa5fbb2d6afb806f8e (patch) | |
| tree | 05f6bcaf8113b7428c7f8315ee8a540ad91940e1 /libs | |
| parent | 7b06e3516ccd452224d9b160c8cf54c3b9f3597d (diff) | |
| download | frameworks_base-d39d1affe82cb8c21d32baaa5fbb2d6afb806f8e.zip frameworks_base-d39d1affe82cb8c21d32baaa5fbb2d6afb806f8e.tar.gz frameworks_base-d39d1affe82cb8c21d32baaa5fbb2d6afb806f8e.tar.bz2 | |
Updates resulting from the Skia merge (revision 1327)
Change-Id: I2a8f5869dbe95bb594f2ba5d7278f9b330e6f17a
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 3232f6f..560c1f9 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -2434,12 +2434,11 @@ void OpenGLRenderer::getAlphaAndMode(SkPaint* paint, int* alpha, SkXfermode::Mod } SkXfermode::Mode OpenGLRenderer::getXfermode(SkXfermode* mode) { - // In the future we should look at unifying the Porter-Duff modes and - // SkXferModes so that we can use SkXfermode::IsMode(xfer, &mode). - if (mode == NULL) { - return SkXfermode::kSrcOver_Mode; + SkXfermode::Mode resultMode; + if (!SkXfermode::AsMode(mode, &resultMode)) { + resultMode = SkXfermode::kSrcOver_Mode; } - return mode->fMode; + return resultMode; } void OpenGLRenderer::setTextureWrapModes(Texture* texture, GLenum wrapS, GLenum wrapT) { |