Remove use of GrColorType as in param in SimpleTextureEffect.fp to just constructor param.

This should also fix a bug in the check generated file housekeeper bot.

Change-Id: I70eeb1f8783c760fcba1e81ea79b2734cae54b25
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248856
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

Author: egdaniel

src/gpu/effects/GrSimpleTextureEffect.fp

@@ -6,10 +6,10 @@
  */
 
 in uniform sampler2D image;
-in GrColorType srcColorType;
 in half4x4 matrix;
 
 @constructorParams {
+    GrColorType srcColorType,
     GrSamplerState samplerParams
 }
 
@@ -26,7 +26,7 @@ in half4x4 matrix;
                                                      GrColorType srcColorType,
                                                      const SkMatrix& matrix) {
         return std::unique_ptr<GrFragmentProcessor>(
-            new GrSimpleTextureEffect(std::move(proxy), srcColorType, matrix,
+            new GrSimpleTextureEffect(std::move(proxy), matrix, srcColorType,
                     GrSamplerState(GrSamplerState::WrapMode::kClamp, GrSamplerState::Filter::kNearest)));
     }
 
@@ -36,7 +36,7 @@ in half4x4 matrix;
                                                      const SkMatrix& matrix,
                                                      GrSamplerState::Filter filter) {
         return std::unique_ptr<GrFragmentProcessor>(
-            new GrSimpleTextureEffect(std::move(proxy), srcColorType, matrix,
+            new GrSimpleTextureEffect(std::move(proxy), matrix, srcColorType,
                                       GrSamplerState(GrSamplerState::WrapMode::kClamp, filter)));
      }
 
@@ -45,7 +45,7 @@ in half4x4 matrix;
                                                      const SkMatrix& matrix,
                                                      const GrSamplerState& p) {
         return std::unique_ptr<GrFragmentProcessor>(
-            new GrSimpleTextureEffect(std::move(proxy), srcColorType, matrix, p));
+            new GrSimpleTextureEffect(std::move(proxy), matrix, srcColorType, p));
     }
 }
 

src/gpu/effects/generated/GrSimpleTextureEffect.cpp

@@ -23,8 +23,6 @@ class GrGLSLSimpleTextureEffect : public GrGLSLFragmentProcessor {
         GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
         const GrSimpleTextureEffect& _outer = args.fFp.cast<GrSimpleTextureEffect>();
         (void)_outer;
-        auto srcColorType = _outer.srcColorType;
-        (void)srcColorType;
         auto matrix = _outer.matrix;
         (void)matrix;
         SkString sk_TransformedCoords2D_0 =
@@ -50,15 +48,13 @@ bool GrSimpleTextureEffect::onIsEqual(const GrFragmentProcessor& other) const {
     const GrSimpleTextureEffect& that = other.cast<GrSimpleTextureEffect>();
     (void)that;
     if (image != that.image) return false;
-    if (srcColorType != that.srcColorType) return false;
     if (matrix != that.matrix) return false;
     return true;
 }
 GrSimpleTextureEffect::GrSimpleTextureEffect(const GrSimpleTextureEffect& src)
         : INHERITED(kGrSimpleTextureEffect_ClassID, src.optimizationFlags())
         , imageCoordTransform(src.imageCoordTransform)
         , image(src.image)
-        , srcColorType(src.srcColorType)
         , matrix(src.matrix) {
     this->setTextureSamplerCnt(1);
     this->addCoordTransform(&imageCoordTransform);

src/gpu/effects/generated/GrSimpleTextureEffect.h

@@ -20,7 +20,7 @@ class GrSimpleTextureEffect : public GrFragmentProcessor {
                                                      GrColorType srcColorType,
                                                      const SkMatrix& matrix) {
         return std::unique_ptr<GrFragmentProcessor>(
-                new GrSimpleTextureEffect(std::move(proxy), srcColorType, matrix,
+                new GrSimpleTextureEffect(std::move(proxy), matrix, srcColorType,
                                           GrSamplerState(GrSamplerState::WrapMode::kClamp,
                                                          GrSamplerState::Filter::kNearest)));
     }
@@ -31,7 +31,7 @@ class GrSimpleTextureEffect : public GrFragmentProcessor {
                                                      const SkMatrix& matrix,
                                                      GrSamplerState::Filter filter) {
         return std::unique_ptr<GrFragmentProcessor>(new GrSimpleTextureEffect(
-                std::move(proxy), srcColorType, matrix,
+                std::move(proxy), matrix, srcColorType,
                 GrSamplerState(GrSamplerState::WrapMode::kClamp, filter)));
     }
 
@@ -40,18 +40,17 @@ class GrSimpleTextureEffect : public GrFragmentProcessor {
                                                      const SkMatrix& matrix,
                                                      const GrSamplerState& p) {
         return std::unique_ptr<GrFragmentProcessor>(
-                new GrSimpleTextureEffect(std::move(proxy), srcColorType, matrix, p));
+                new GrSimpleTextureEffect(std::move(proxy), matrix, srcColorType, p));
     }
     GrSimpleTextureEffect(const GrSimpleTextureEffect& src);
     std::unique_ptr<GrFragmentProcessor> clone() const override;
     const char* name() const override { return "SimpleTextureEffect"; }
     GrCoordTransform imageCoordTransform;
     TextureSampler image;
-    GrColorType srcColorType;
     SkMatrix44 matrix;
 
 private:
-    GrSimpleTextureEffect(sk_sp<GrTextureProxy> image, GrColorType srcColorType, SkMatrix44 matrix,
+    GrSimpleTextureEffect(sk_sp<GrTextureProxy> image, SkMatrix44 matrix, GrColorType srcColorType,
                           GrSamplerState samplerParams)
             : INHERITED(kGrSimpleTextureEffect_ClassID,
                         (OptimizationFlags)ModulateForSamplerOptFlags(
@@ -62,7 +61,6 @@ class GrSimpleTextureEffect : public GrFragmentProcessor {
                                                 GrSamplerState::WrapMode::kClampToBorder))
             , imageCoordTransform(matrix, image.get())
             , image(std::move(image), samplerParams)
-            , srcColorType(srcColorType)
             , matrix(matrix) {
         this->setTextureSamplerCnt(1);
         this->addCoordTransform(&imageCoordTransform);

src/sksl/sksl_enums.inc

@@ -32,37 +32,4 @@ enum class PMConversion {
     kPMConversionCnt = 2
 };
 
-enum class GrColorType {
-    kUnknown,
-    kAlpha_8,
-    kBGR_565,
-    kABGR_4444,  // This name differs from SkColorType. kARGB_4444_SkColorType is misnamed.
-    kRGBA_8888,
-    kRGBA_8888_SRGB,
-    kRGB_888x,
-    kRG_88,
-    kBGRA_8888,
-    kRGBA_1010102,
-    kGray_8,
-    kAlpha_F16,
-    kRGBA_F16,
-    kRGBA_F16_Clamped,
-    kRGBA_F32,
-
-    kAlpha_16,
-    kRG_1616,
-    kRG_F16,
-    kRGBA_16161616,
-
-    // Unusual formats that come up after reading back in cases where we are reassigning the meaning
-    // of a texture format's channels to use for a particular color format but have to read back the
-    // data to a full RGBA quadruple. (e.g. using a R8 texture format as A8 color type but the API
-    // only supports reading to RGBA8.) None of these have SkColorType equivalents.
-    kAlpha_8xxx,
-    kAlpha_F32xxx,
-    kGray_8xxx,
-
-    kLast = kGray_8xxx
-};
-
 )"