commit cf86085583faef7a922647497926343a952dd133
author Brian Osman <brianosman@google.com> Wed Oct 31 14:04:39 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 31 19:25:20 2018 +0000
tree 920b5d09e3a898e33dff75ba13c8784ce60ae456
parent 348a03729796ffa8b4f6142bbe90d408fc900f0f

Replace GrColor4h with SkPMColor4f

- Mechanical replacement of GrColor4h (used throughout Ops) with
  SkPMColor4f.
- API adaptation (to/FromGrColor -> to/From_BytesRGBA).
- Complete removal of FromFloats (source was already SkPMColor4f),
  and toFloats (setting uniforms can directly access .vec()).

Bug: skia:
Change-Id: I37eece1fa7ed2545dc6843e840d4cc3c60f19747
Reviewed-on: https://skia-review.googlesource.com/c/166620
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

tests/GrPorterDuffTest.cpp

diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp
index d502c57..2bbfa4c 100644
--- a/tests/GrPorterDuffTest.cpp
+++ b/tests/GrPorterDuffTest.cpp
@@ -63,7 +63,7 @@
     GrPaint paint;
     paint.setXPFactory(xpf);
     GrProcessorSet procs(std::move(paint));
-    GrColor4h overrideColor;
+    SkPMColor4f overrideColor;
     GrProcessorSet::Analysis analysis =
             procs.finalize(colorInput, coverageInput, nullptr, false, caps, &overrideColor);
     return analysis;
@@ -470,7 +470,8 @@
 }
 
 static void test_color_not_opaque_no_coverage(skiatest::Reporter* reporter, const GrCaps& caps) {
-    GrProcessorAnalysisColor inputColor(GrColor4h::FromGrColor(GrColorPackRGBA(229, 0, 154, 240)));
+    GrProcessorAnalysisColor inputColor(
+            SkPMColor4f::FromBytes_RGBA(GrColorPackRGBA(229, 0, 154, 240)));
     GrProcessorAnalysisCoverage inputCoverage = GrProcessorAnalysisCoverage::kNone;
 
     for (int m = 0; m <= (int)SkBlendMode::kLastCoeffMode; m++) {
@@ -1012,7 +1013,7 @@
 
 static void test_lcd_coverage_fallback_case(skiatest::Reporter* reporter, const GrCaps& caps) {
     const GrXPFactory* xpf = GrPorterDuffXPFactory::Get(SkBlendMode::kSrcOver);
-    GrProcessorAnalysisColor color = GrColor4h::FromGrColor(GrColorPackRGBA(123, 45, 67, 255));
+    GrProcessorAnalysisColor color = SkPMColor4f::FromBytes_RGBA(GrColorPackRGBA(123, 45, 67, 255));
     GrProcessorAnalysisCoverage coverage = GrProcessorAnalysisCoverage::kLCD;
     TEST_ASSERT(!(GrXPFactory::GetAnalysisProperties(xpf, color, coverage, caps) &
                   GrXPFactory::AnalysisProperties::kRequiresDstTexture));
@@ -1028,7 +1029,7 @@
     TEST_ASSERT(blendInfo.fWriteColor);
 
     // Test with non-opaque alpha
-    color = GrColor4h::FromGrColor(GrColorPackRGBA(123, 45, 67, 221));
+    color = SkPMColor4f::FromBytes_RGBA(GrColorPackRGBA(123, 45, 67, 221));
     coverage = GrProcessorAnalysisCoverage::kLCD;
     TEST_ASSERT(!(GrXPFactory::GetAnalysisProperties(xpf, color, coverage, caps) &
                 GrXPFactory::AnalysisProperties::kRequiresDstTexture));
@@ -1074,8 +1075,8 @@
 
     static const GrProcessorAnalysisColor colorInputs[] = {
             GrProcessorAnalysisColor::Opaque::kNo, GrProcessorAnalysisColor::Opaque::kYes,
-            GrProcessorAnalysisColor(GrColor4h::FromGrColor(GrColorPackRGBA(0, 82, 17, 100))),
-            GrProcessorAnalysisColor(GrColor4h::FromGrColor(GrColorPackRGBA(0, 82, 17, 255)))};
+            GrProcessorAnalysisColor(SkPMColor4f::FromBytes_RGBA(GrColorPackRGBA(0, 82, 17, 100))),
+            GrProcessorAnalysisColor(SkPMColor4f::FromBytes_RGBA(GrColorPackRGBA(0, 82, 17, 255)))};
 
     for (const auto& colorInput : colorInputs) {
         for (GrProcessorAnalysisCoverage coverageType :