Remove localcoordchange functions off paint

src/gpu/effects/GrDistanceFieldTextureEffect.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDistanceFieldTextureEffect.h"
 #include "GrInvariantOutput.h"
 #include "GrTexture.h"
@@ skipping 149 matching lines @@
     }
 
     static inline void GenKey(const GrGeometryProcessor& processor,
                               const GrBatchTracker& bt,
                               const GrGLCaps&,
                               GrProcessorKeyBuilder* b) {
         const GrDistanceFieldTextureEffect& dfTexEffect =
                 processor.cast<GrDistanceFieldTextureEffect>();
         const DistanceFieldBatchTracker& local = bt.cast<DistanceFieldBatchTracker>();
         b->add32(dfTexEffect.getFlags());
-        b->add32(local.fInputColorType);
+        b->add32((local.fInputColorType << 16) |

[bsalomon, 2014/12/22 21:13:55]

consolidate in a single int?

+                 (local.fUsesLocalCoords && processor.localMatrix().hasPerspective() ? 0x1 : 0x0));
     }
 
 private:
     GrColor       fColor;
     UniformHandle fColorUniform;
     UniformHandle fTextureSizeUni;
     SkISize       fTextureSize;
     UniformHandle fLuminanceUni;
     float         fLuminance;
 
@@ skipping 235 matching lines @@
 
     static inline void GenKey(const GrGeometryProcessor& proc,
                               const GrBatchTracker& bt,
                               const GrGLCaps&,
                               GrProcessorKeyBuilder* b) {
         const GrDistanceFieldNoGammaTextureEffect& dfTexEffect =
             proc.cast<GrDistanceFieldNoGammaTextureEffect>();
 
         const DistanceFieldNoGammaBatchTracker& local = bt.cast<DistanceFieldNoGammaBatchTracker>();
         b->add32(dfTexEffect.getFlags());
-        b->add32(local.fInputColorType);
+        b->add32((local.fInputColorType << 16) |
+                 (local.fUsesLocalCoords && proc.localMatrix().hasPerspective() ? 0x1 : 0x0));
     }
 
 private:
     UniformHandle fColorUniform;
     UniformHandle fTextureSizeUni;
     GrColor       fColor;
     SkISize       fTextureSize;
 
     typedef GrGLGeometryProcessor INHERITED;
 };
@@ skipping 281 matching lines @@
 
     static inline void GenKey(const GrGeometryProcessor& processor,
                               const GrBatchTracker& bt,
                               const GrGLCaps&,
                               GrProcessorKeyBuilder* b) {
         const GrDistanceFieldLCDTextureEffect& dfTexEffect =
                 processor.cast<GrDistanceFieldLCDTextureEffect>();
 
         const DistanceFieldLCDBatchTracker& local = bt.cast<DistanceFieldLCDBatchTracker>();
         b->add32(dfTexEffect.getFlags());
-        b->add32(local.fInputColorType);
+        b->add32((local.fInputColorType << 16) |
+                 (local.fUsesLocalCoords && processor.localMatrix().hasPerspective() ? 0x1 : 0x0));
     }
 
 private:
     GrColor       fColor;
     UniformHandle fColorUniform;
     UniformHandle fTextureSizeUni;
     SkISize       fTextureSize;
     UniformHandle fTextColorUni;
     SkColor       fTextColor;
 
@@ skipping 92 matching lines @@
                                         random->nextULessThan(256),
                                         random->nextULessThan(256));
     uint32_t flags = kUseLCD_DistanceFieldEffectFlag;
     flags |= random->nextBool() ? kUniformScale_DistanceFieldEffectMask : 0;
     flags |= random->nextBool() ? kBGR_DistanceFieldEffectFlag : 0;
     return GrDistanceFieldLCDTextureEffect::Create(GrRandomColor(random), textures[texIdx], params,
                                                    textures[texIdx2], params2,
                                                    textColor,
                                                    flags);
 }