commit d25b7c10b55264240b987c4d02ef2421ca67e52c
author Brian Osman <brianosman@google.com> Fri Sep 21 16:01:59 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Sep 21 20:37:04 2018 +0000
tree 1790eddf00ca32357f12fefe2f9ada20091e845e
parent 470ee464b23a7a02035c61fd792e1c775760acfc

Introduce SkRGBA4f, templated on SkAlphaType

Most functionality is shared, but this lets us get type safety.
SkColor4f = SkRGBA4f<kUnpremul>
SkPMColor4f = SkRGBA4f<kPremul>

Change-Id: I27408565dc92e722f42a185cecbf7af15d1dde3f
Reviewed-on: https://skia-review.googlesource.com/156243
Commit-Queue: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>

src/core/SkDraw_vertices.cpp

diff --git a/src/core/SkDraw_vertices.cpp b/src/core/SkDraw_vertices.cpp
index 939d616..b9bc2e6 100644
--- a/src/core/SkDraw_vertices.cpp
+++ b/src/core/SkDraw_vertices.cpp
@@ -10,6 +10,7 @@
 #include "SkComposeShader.h"
 #include "SkDraw.h"
 #include "SkNx.h"
+#include "SkPM4f.h"
 #include "SkRasterClip.h"
 #include "SkScan.h"
 #include "SkShaderBase.h"
@@ -97,7 +98,7 @@
 };
 
 static bool SK_WARN_UNUSED_RESULT
-update_tricolor_matrix(const SkMatrix& ctmInv, const SkPoint pts[], const SkColor4f colors[],
+update_tricolor_matrix(const SkMatrix& ctmInv, const SkPoint pts[], const SkPMColor4f colors[],
                        int index0, int index1, int index2, Matrix43* result) {
     SkMatrix m, im;
     m.reset();
@@ -135,9 +136,9 @@
 // - convert colors into dst colorspace before interpolation (matches gradients)
 // - apply per-color alpha before interpolation (matches old version of vertices)
 //
-static SkColor4f* convert_colors(const SkColor src[], int count, SkColorSpace* deviceCS,
+static SkPMColor4f* convert_colors(const SkColor src[], int count, SkColorSpace* deviceCS,
                                  SkArenaAlloc* alloc) {
-    SkColor4f* dst = alloc->makeArray<SkColor4f>(count);
+    SkPMColor4f* dst = alloc->makeArray<SkPMColor4f>(count);
     if (!deviceCS) {
         for (int i = 0; i < count; ++i) {
             dst[i] = SkColor4f::FromColor(src[i]).premul();
@@ -268,7 +269,7 @@
     VertState::Proc vertProc = state.chooseProc(vmode);
 
     if (colors || textures) {
-        SkColor4f*  dstColors = nullptr;
+        SkPMColor4f*  dstColors = nullptr;
         Matrix43*   matrix43 = nullptr;
 
         if (colors) {