Refactor GrColorSpaceXformHelper

Nonlinear blending mode is going to (sometimes) require additional
uniforms and shader code for color space transformation.

This change just alters the usage of the helper struct so that we can
hide any new logic (without having to change all the FPs that use it).

BUG=skia:

Change-Id: I913478a387973f5bad5aa09a29f85d21daacab94
Reviewed-on: https://skia-review.googlesource.com/9414
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp
index bd4e7206f8..8492f5b80b 100644
--- a/src/gpu/effects/GrSimpleTextureEffect.cpp
+++ b/src/gpu/effects/GrSimpleTextureEffect.cpp
@@ -42,9 +42,7 @@ class GrGLSimpleTextureEffect : public GrGLSLFragmentProcessor {
 public:
     void emitCode(EmitArgs& args) override {
         const GrSimpleTextureEffect& textureEffect = args.fFp.cast<GrSimpleTextureEffect>();
-        GrGLSLColorSpaceXformHelper colorSpaceHelper(args.fUniformHandler,
-                                                     textureEffect.colorSpaceXform(),
-                                                     &fColorSpaceXformUni);
+        fColorSpaceHelper.emitCode(args.fUniformHandler, textureEffect.colorSpaceXform());
 
         GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
         fragBuilder->codeAppendf("%s = ", args.fOutputColor);
@@ -52,7 +50,7 @@ public:
                                                     args.fTexSamplers[0],
                                                     args.fTransformedCoords[0].c_str(),
                                                     args.fTransformedCoords[0].getType(),
-                                                    &colorSpaceHelper);
+                                                    &fColorSpaceHelper);
         fragBuilder->codeAppend(";");
     }
 
@@ -66,14 +64,14 @@ protected:
     void onSetData(const GrGLSLProgramDataManager& pdman, const GrProcessor& processor) override {
         const GrSimpleTextureEffect& textureEffect = processor.cast<GrSimpleTextureEffect>();
         if (SkToBool(textureEffect.colorSpaceXform())) {
-            pdman.setSkMatrix44(fColorSpaceXformUni, textureEffect.colorSpaceXform()->srcToDst());
+            fColorSpaceHelper.setData(pdman, textureEffect.colorSpaceXform());
         }
     }
 
 private:
     typedef GrGLSLFragmentProcessor INHERITED;
 
-    UniformHandle fColorSpaceXformUni;
+    GrGLSLColorSpaceXformHelper fColorSpaceHelper;
 };
 
 ///////////////////////////////////////////////////////////////////////////////