diff options
author | 2015-07-08 09:36:59 -0700 | |
---|---|---|
committer | 2015-07-08 09:36:59 -0700 | |
commit | b2456053c7e20e5439915cd2954c71f73bc85375 (patch) | |
tree | 731803e3678656310fb549e744a157107af96563 /src/core/SkXfermode.cpp | |
parent | 85ff25e8d905502ec09d057ecc6245f487bf94ce (diff) |
more threading of GrShaderDataManager
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1215643006
Diffstat (limited to 'src/core/SkXfermode.cpp')
-rw-r--r-- | src/core/SkXfermode.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index d8ca8f1e6e..3ebd24c981 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -658,7 +658,8 @@ bool SkXfermode::asMode(Mode* mode) const { return false; } -bool SkXfermode::asFragmentProcessor(GrFragmentProcessor**, GrTexture*) const { +bool SkXfermode::asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*, + GrTexture*) const { return false; } @@ -928,10 +929,12 @@ void SkProcCoeffXfermode::xferA8(SkAlpha* SK_RESTRICT dst, #include "effects/GrCustomXfermode.h" bool SkProcCoeffXfermode::asFragmentProcessor(GrFragmentProcessor** fp, + GrShaderDataManager* shaderDataManager, GrTexture* background) const { if (GrCustomXfermode::IsSupportedMode(fMode)) { if (fp) { - *fp = GrCustomXfermode::CreateFP(fMode, background); + SkASSERT(shaderDataManager); + *fp = GrCustomXfermode::CreateFP(shaderDataManager, fMode, background); SkASSERT(*fp); } return true; |