diff options
| author |  egdaniel <egdaniel@google.com> | 2015-11-13 08:34:52 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-13 08:34:52 -0800 |
| commit | fa4cc8bf2aa782431609dd2ac16b1fc36de72e44 (patch) | |
| tree | 26c306d55e2a7adeea52a4db5477f70b16592e48 /src/gpu/effects/GrCustomXfermode.cpp | |
| parent | 266e2024ec487425f56473e272a6b81bfbf2c543 (diff) | |
Move XferProcessors to glsl
This is basically a move and rename
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1440073002
Diffstat (limited to 'src/gpu/effects/GrCustomXfermode.cpp')
| -rw-r--r-- | src/gpu/effects/GrCustomXfermode.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp index e54627c4e5..ff163e2fb6 100644 --- a/src/gpu/effects/GrCustomXfermode.cpp +++ b/src/gpu/effects/GrCustomXfermode.cpp @@ -15,13 +15,13 @@ #include "GrTexture.h" #include "GrTextureAccess.h" #include "SkXfermode.h" -#include "gl/GrGLXferProcessor.h" #include "glsl/GrGLSLBlend.h" #include "glsl/GrGLSLCaps.h" #include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" +#include "glsl/GrGLSLXferProcessor.h" bool GrCustomXfermode::IsSupportedMode(SkXfermode::Mode mode) { return mode > SkXfermode::kLastCoeffMode && mode <= SkXfermode::kLastMode; @@ -88,7 +88,7 @@ public: const char* name() const override { return "Custom Xfermode"; } - GrGLXferProcessor* createGLInstance() const override; + GrGLSLXferProcessor* createGLInstance() const override; SkXfermode::Mode mode() const { return fMode; } bool hasHWBlendEquation() const { return -1 != static_cast<int>(fHWBlendEquation); } @@ -121,7 +121,7 @@ private: /////////////////////////////////////////////////////////////////////////////// -class GLCustomXP : public GrGLXferProcessor { +class GLCustomXP : public GrGLSLXferProcessor { public: GLCustomXP(const GrXferProcessor&) {} ~GLCustomXP() override {} @@ -170,7 +170,7 @@ private: void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) override {} - typedef GrGLXferProcessor INHERITED; + typedef GrGLSLXferProcessor INHERITED; }; /////////////////////////////////////////////////////////////////////////////// @@ -179,7 +179,7 @@ void CustomXP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder GLCustomXP::GenKey(*this, caps, b); } -GrGLXferProcessor* CustomXP::createGLInstance() const { +GrGLSLXferProcessor* CustomXP::createGLInstance() const { SkASSERT(this->willReadDstColor() != this->hasHWBlendEquation()); return new GLCustomXP(*this); } |