diff options
author | 2017-07-26 19:07:15 -0400 | |
---|---|---|
committer | 2017-07-26 23:31:30 +0000 | |
commit | 6cd51b51d6603a3100b147c45f38697f2f199fc6 (patch) | |
tree | 55d6bebf39125e0cdb0cd30c4fb6f8489428931a /src/gpu/effects/GrTextureDomain.h | |
parent | 7f97f49a840c92e26058034c631e8d76a54897bd (diff) |
Remove GrSingleTextureEffect
Change-Id: I510cc0657f9433b206dc2ab643fa557667263294
Reviewed-on: https://skia-review.googlesource.com/27180
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu/effects/GrTextureDomain.h')
-rw-r--r-- | src/gpu/effects/GrTextureDomain.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/gpu/effects/GrTextureDomain.h b/src/gpu/effects/GrTextureDomain.h index c74a9919c4..f134d8deb5 100644 --- a/src/gpu/effects/GrTextureDomain.h +++ b/src/gpu/effects/GrTextureDomain.h @@ -8,7 +8,9 @@ #ifndef GrTextureDomainEffect_DEFINED #define GrTextureDomainEffect_DEFINED -#include "GrSingleTextureEffect.h" +#include "GrCoordTransform.h" +#include "GrFragmentProcessor.h" +#include "GrColorSpaceXform.h" #include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -149,8 +151,7 @@ protected: /** * A basic texture effect that uses GrTextureDomain. */ -class GrTextureDomainEffect : public GrSingleTextureEffect { - +class GrTextureDomainEffect : public GrFragmentProcessor { public: static sk_sp<GrFragmentProcessor> Make(sk_sp<GrTextureProxy>, sk_sp<GrColorSpaceXform>, @@ -171,7 +172,10 @@ public: } private: + GrCoordTransform fCoordTransform; GrTextureDomain fTextureDomain; + TextureSampler fTextureSampler; + sk_sp<GrColorSpaceXform> fColorSpaceXform; GrTextureDomainEffect(sk_sp<GrTextureProxy>, sk_sp<GrColorSpaceXform>, @@ -188,9 +192,11 @@ private: bool onIsEqual(const GrFragmentProcessor&) const override; + const GrColorSpaceXform* colorSpaceXform() const { return fColorSpaceXform.get(); } + GR_DECLARE_FRAGMENT_PROCESSOR_TEST - typedef GrSingleTextureEffect INHERITED; + typedef GrFragmentProcessor INHERITED; }; class GrDeviceSpaceTextureDecalFragmentProcessor : public GrFragmentProcessor { |