diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-07 17:13:10 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-07 17:13:10 +0000 |
| commit | 372a9c3f443bdcc60b0e0c17f028461eaaed5fd1 (patch) | |
| tree | 45763f33b49e7d4d813fa42becd53a1f5462c275 /src | |
| parent | 0f23ff1bcc9c725f0073a5b5689e86ea86c7f69b (diff) | |
Fix EffectKey for XferEffect
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/227233007
git-svn-id: http://skia.googlecode.com/svn/trunk@14076 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkXfermode.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index 674078ef3a..78b85daa3e 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -1079,7 +1079,10 @@ public: } static inline EffectKey GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&) { - return drawEffect.castEffect<XferEffect>().mode(); + // The background may come from the dst or from a texture. + int numTextures = (*drawEffect.effect())->numTextures(); + SkASSERT(numTextures <= 1); + return (drawEffect.castEffect<XferEffect>().mode() << 1) | numTextures; } private: |