Keep paint color range/precision into ops and GPs (using GrColor4h)
We still degrade to bytes when creating vertices (tagged TODO4F).
Note: Guarded for Chrome (by making GrColor4h a wrapper around
GrColor).
Bug: skia:
Change-Id: Id8a1d9eec7978d52b059cd9952666bc1217ee073
Reviewed-on: https://skia-review.googlesource.com/c/165527
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index 68b8b8e..6896526 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -765,7 +765,7 @@
stencilSettings);
}
- AAConvexPathOp(const Helper::MakeArgs& helperArgs, GrColor color, const SkMatrix& viewMatrix,
+ AAConvexPathOp(const Helper::MakeArgs& helperArgs, GrColor4h color, const SkMatrix& viewMatrix,
const SkPath& path, const GrUserStencilSettings* stencilSettings)
: INHERITED(ClassID()), fHelper(helperArgs, GrAAType::kCoverage, stencilSettings) {
fPaths.emplace_back(PathData{viewMatrix, path, color});
@@ -843,7 +843,8 @@
return;
}
- extract_lines_only_verts(tess, verts, vertexStride, args.fColor, idxs,
+ // TODO4F: Preserve float colors
+ extract_lines_only_verts(tess, verts, vertexStride, args.fColor.toGrColor(), idxs,
fHelper.compatibleWithAlphaAsCoverage());
GrMesh* mesh = target->allocMesh(GrPrimitiveType::kTriangles);
@@ -929,7 +930,8 @@
}
SkSTArray<kPreallocDrawCnt, Draw, true> draws;
- create_vertices(segments, fanPt, args.fColor, &draws, verts, idxs);
+ // TODO4F: Preserve float colors
+ create_vertices(segments, fanPt, args.fColor.toGrColor(), &draws, verts, idxs);
GrMesh* meshes = target->allocMeshes(draws.count());
for (int j = 0; j < draws.count(); ++j) {
@@ -967,7 +969,7 @@
struct PathData {
SkMatrix fViewMatrix;
SkPath fPath;
- GrColor fColor;
+ GrColor4h fColor;
};
Helper fHelper;
diff --git a/src/gpu/ops/GrAAFillRectOp.cpp b/src/gpu/ops/GrAAFillRectOp.cpp
index f1987a7..b77f09e 100644
--- a/src/gpu/ops/GrAAFillRectOp.cpp
+++ b/src/gpu/ops/GrAAFillRectOp.cpp
@@ -185,7 +185,7 @@
}
AAFillRectOp(const Helper::MakeArgs& helperArgs,
- GrColor color,
+ GrColor4h color,
const SkMatrix& viewMatrix,
const SkRect& rect,
const SkRect& devRect,
@@ -219,7 +219,8 @@
for (int i = 0; i < fRectCnt; ++i) {
const SkRect& rect = info->rect();
str.appendf("%d: Color: 0x%08x, Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f]\n", i,
- info->color(), rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
+ info->color().toGrColor(), rect.fLeft, rect.fTop, rect.fRight,
+ rect.fBottom);
info = this->next(info);
}
str += fHelper.dumpInfo();
@@ -230,7 +231,7 @@
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor color = this->first()->color();
+ GrColor4h color = this->first()->color();
auto result = fHelper.xpRequiresDstTexture(
caps, clip, GrProcessorAnalysisCoverage::kSingleChannel, &color);
this->first()->setColor(color);
@@ -285,8 +286,9 @@
localMatrix = &SkMatrix::I();
}
}
- generate_aa_fill_rect_geometry(verts, vertexStride, info->color(), info->viewMatrix(),
- info->rect(), info->devRect(),
+ // TODO4F: Preserve float colors
+ generate_aa_fill_rect_geometry(verts, vertexStride, info->color().toGrColor(),
+ info->viewMatrix(), info->rect(), info->devRect(),
fHelper.compatibleWithAlphaAsCoverage(), localMatrix);
info = this->next(info);
}
@@ -307,21 +309,21 @@
struct RectInfo {
public:
- RectInfo(GrColor color, const SkMatrix& viewMatrix, const SkRect& rect,
+ RectInfo(GrColor4h color, const SkMatrix& viewMatrix, const SkRect& rect,
const SkRect& devRect)
: RectInfo(color, viewMatrix, rect, devRect, HasLocalMatrix::kNo) {}
bool hasLocalMatrix() const { return HasLocalMatrix::kYes == fHasLocalMatrix; }
- GrColor color() const { return fColor; }
+ GrColor4h color() const { return fColor; }
const SkMatrix& viewMatrix() const { return fViewMatrix; }
const SkRect& rect() const { return fRect; }
const SkRect& devRect() const { return fDevRect; }
- void setColor(GrColor color) { fColor = color; }
+ void setColor(GrColor4h color) { fColor = color; }
protected:
enum class HasLocalMatrix : uint32_t { kNo, kYes };
- RectInfo(GrColor color, const SkMatrix& viewMatrix, const SkRect& rect,
+ RectInfo(GrColor4h color, const SkMatrix& viewMatrix, const SkRect& rect,
const SkRect& devRect, HasLocalMatrix hasLM)
: fHasLocalMatrix(hasLM)
, fColor(color)
@@ -330,7 +332,7 @@
, fDevRect(devRect) {}
HasLocalMatrix fHasLocalMatrix;
- GrColor fColor;
+ GrColor4h fColor;
SkMatrix fViewMatrix;
SkRect fRect;
SkRect fDevRect;
@@ -338,7 +340,7 @@
struct RectWithLocalMatrixInfo : public RectInfo {
public:
- RectWithLocalMatrixInfo(GrColor color, const SkMatrix& viewMatrix, const SkRect& rect,
+ RectWithLocalMatrixInfo(GrColor4h color, const SkMatrix& viewMatrix, const SkRect& rect,
const SkRect& devRect, const SkMatrix& localMatrix)
: RectInfo(color, viewMatrix, rect, devRect, HasLocalMatrix::kYes)
, fLocalMatrix(localMatrix) {}
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
index c59d53f..3bfc055 100644
--- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@@ -803,7 +803,7 @@
}
AAHairlineOp(const Helper::MakeArgs& helperArgs,
- GrColor color,
+ GrColor4h color,
uint8_t coverage,
const SkMatrix& viewMatrix,
const SkPath& path,
@@ -828,8 +828,8 @@
SkString dumpInfo() const override {
SkString string;
- string.appendf("Color: 0x%08x Coverage: 0x%02x, Count: %d\n", fColor, fCoverage,
- fPaths.count());
+ string.appendf("Color: 0x%08x Coverage: 0x%02x, Count: %d\n", fColor.toGrColor(),
+ fCoverage, fPaths.count());
string += INHERITED::dumpInfo();
string += fHelper.dumpInfo();
return string;
@@ -885,7 +885,7 @@
return CombineResult::kMerged;
}
- GrColor color() const { return fColor; }
+ GrColor4h color() const { return fColor; }
uint8_t coverage() const { return fCoverage; }
const SkMatrix& viewMatrix() const { return fPaths[0].fViewMatrix; }
@@ -898,7 +898,7 @@
SkSTArray<1, PathData, true> fPaths;
Helper fHelper;
- GrColor fColor;
+ GrColor4h fColor;
uint8_t fCoverage;
typedef GrMeshDrawOp INHERITED;
diff --git a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
index 1ecceb1..51a1b87 100644
--- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@@ -157,7 +157,7 @@
}
AAFlatteningConvexPathOp(const Helper::MakeArgs& helperArgs,
- GrColor color,
+ GrColor4h color,
const SkMatrix& viewMatrix,
const SkPath& path,
SkScalar strokeWidth,
@@ -195,7 +195,8 @@
string.appendf(
"Color: 0x%08x, StrokeWidth: %.2f, Style: %d, Join: %d, "
"MiterLimit: %.2f\n",
- path.fColor, path.fStrokeWidth, path.fStyle, path.fJoin, path.fMiterLimit);
+ path.fColor.toGrColor(), path.fStrokeWidth, path.fStyle, path.fJoin,
+ path.fMiterLimit);
}
string += fHelper.dumpInfo();
string += INHERITED::dumpInfo();
@@ -304,8 +305,9 @@
indices = (uint16_t*) sk_realloc_throw(indices, maxIndices * sizeof(uint16_t));
}
- extract_verts(tess, vertices + vertexStride * vertexCount, vertexStride, args.fColor,
- vertexCount, indices + indexCount,
+ // TODO4F: Preserve float colors
+ extract_verts(tess, vertices + vertexStride * vertexCount, vertexStride,
+ args.fColor.toGrColor(), vertexCount, indices + indexCount,
fHelper.compatibleWithAlphaAsCoverage());
vertexCount += currentVertices;
indexCount += currentIndices;
@@ -331,7 +333,7 @@
const SkMatrix& viewMatrix() const { return fPaths[0].fViewMatrix; }
struct PathData {
- GrColor fColor;
+ GrColor4h fColor;
SkMatrix fViewMatrix;
SkPath fPath;
SkScalar fStrokeWidth;
diff --git a/src/gpu/ops/GrAAStrokeRectOp.cpp b/src/gpu/ops/GrAAStrokeRectOp.cpp
index 625635e..92f0c62 100644
--- a/src/gpu/ops/GrAAStrokeRectOp.cpp
+++ b/src/gpu/ops/GrAAStrokeRectOp.cpp
@@ -133,7 +133,7 @@
devOutside, devInside);
}
- AAStrokeRectOp(const Helper::MakeArgs& helperArgs, GrColor color, const SkMatrix& viewMatrix,
+ AAStrokeRectOp(const Helper::MakeArgs& helperArgs, GrColor4h color, const SkMatrix& viewMatrix,
const SkRect& devOutside, const SkRect& devInside)
: INHERITED(ClassID())
, fHelper(helperArgs, GrAAType::kCoverage)
@@ -159,7 +159,7 @@
stroke, isMiter);
}
- AAStrokeRectOp(const Helper::MakeArgs& helperArgs, GrColor color, const SkMatrix& viewMatrix,
+ AAStrokeRectOp(const Helper::MakeArgs& helperArgs, GrColor4h color, const SkMatrix& viewMatrix,
const SkRect& rect, const SkStrokeRec& stroke, bool isMiter)
: INHERITED(ClassID())
, fHelper(helperArgs, GrAAType::kCoverage)
@@ -193,7 +193,7 @@
"Color: 0x%08x, ORect [L: %.2f, T: %.2f, R: %.2f, B: %.2f], "
"AssistORect [L: %.2f, T: %.2f, R: %.2f, B: %.2f], "
"IRect [L: %.2f, T: %.2f, R: %.2f, B: %.2f], Degen: %d",
- info.fColor, info.fDevOutside.fLeft, info.fDevOutside.fTop,
+ info.fColor.toGrColor(), info.fDevOutside.fLeft, info.fDevOutside.fTop,
info.fDevOutside.fRight, info.fDevOutside.fBottom, info.fDevOutsideAssist.fLeft,
info.fDevOutsideAssist.fTop, info.fDevOutsideAssist.fRight,
info.fDevOutsideAssist.fBottom, info.fDevInside.fLeft, info.fDevInside.fTop,
@@ -244,7 +244,7 @@
// TODO support AA rotated stroke rects by copying around view matrices
struct RectInfo {
- GrColor fColor;
+ GrColor4h fColor;
SkRect fDevOutside;
SkRect fDevOutsideAssist;
SkRect fDevInside;
@@ -299,7 +299,7 @@
vertexStride,
outerVertexNum,
innerVertexNum,
- info.fColor,
+ info.fColor.toGrColor(), // TODO4F
info.fDevOutside,
info.fDevOutsideAssist,
info.fDevInside,
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 7c14c6c..7c3a834 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -123,7 +123,7 @@
for (int i = 0; i < fGeoCount; ++i) {
str.appendf("%d: Color: 0x%08x Trans: %.2f,%.2f Runs: %d\n",
i,
- fGeoData[i].fColor,
+ fGeoData[i].fColor.toGrColor(),
fGeoData[i].fX,
fGeoData[i].fY,
fGeoData[i].fBlob->runCount());
@@ -346,9 +346,10 @@
for (int i = 0; i < fGeoCount; i++) {
const Geometry& args = fGeoData[i];
Blob* blob = args.fBlob;
+ // TODO4F: Preserve float colors
GrTextBlob::VertexRegenerator regenerator(
resourceProvider, blob, args.fRun, args.fSubRun, args.fViewMatrix, args.fX, args.fY,
- args.fColor, target->deferredUploadTarget(), glyphCache, atlasManager,
+ args.fColor.toGrColor(), target->deferredUploadTarget(), glyphCache, atlasManager,
&autoGlyphCache);
bool done = false;
while (!done) {
diff --git a/src/gpu/ops/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h
index df2f11c..9fabe91 100644
--- a/src/gpu/ops/GrAtlasTextOp.h
+++ b/src/gpu/ops/GrAtlasTextOp.h
@@ -31,14 +31,14 @@
typedef GrTextBlob Blob;
struct Geometry {
- SkMatrix fViewMatrix;
- SkIRect fClipRect;
- Blob* fBlob;
- SkScalar fX;
- SkScalar fY;
- uint16_t fRun;
- uint16_t fSubRun;
- GrColor fColor;
+ SkMatrix fViewMatrix;
+ SkIRect fClipRect;
+ Blob* fBlob;
+ SkScalar fX;
+ SkScalar fY;
+ uint16_t fRun;
+ uint16_t fSubRun;
+ GrColor4h fColor;
};
static std::unique_ptr<GrAtlasTextOp> MakeBitmap(GrContext* context,
@@ -145,7 +145,7 @@
inline void flush(GrMeshDrawOp::Target* target, FlushInfo* flushInfo) const;
- GrColor color() const { SkASSERT(fGeoCount > 0); return fGeoData[0].fColor; }
+ GrColor4h color() const { SkASSERT(fGeoCount > 0); return fGeoData[0].fColor; }
bool usesLocalCoords() const { return fUsesLocalCoords; }
int numGlyphs() const { return fNumGlyphs; }
diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
index 2a36607..d1b4f28 100644
--- a/src/gpu/ops/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@@ -244,7 +244,7 @@
* Bounding geometry is rendered and the effect computes coverage based on the fragment's
* position relative to the dashed line.
*/
-static sk_sp<GrGeometryProcessor> make_dash_gp(GrColor,
+static sk_sp<GrGeometryProcessor> make_dash_gp(GrColor4h,
AAMode aaMode,
DashCap cap,
const SkMatrix& localMatrix,
@@ -332,7 +332,7 @@
DashOp(GrPaint&& paint, const LineData& geometry, SkPaint::Cap cap, AAMode aaMode,
bool fullDash, const GrUserStencilSettings* stencilSettings)
: INHERITED(ClassID())
- , fColor(paint.getColor())
+ , fColor(GrColor4h::FromFloats(paint.getColor4f().vec()))
, fFullDash(fullDash)
, fCap(cap)
, fAAMode(aaMode)
@@ -734,7 +734,7 @@
return CombineResult::kMerged;
}
- GrColor color() const { return fColor; }
+ GrColor4h color() const { return fColor; }
const SkMatrix& viewMatrix() const { return fLines[0].fViewMatrix; }
AAMode aaMode() const { return fAAMode; }
bool fullDash() const { return fFullDash; }
@@ -744,7 +744,7 @@
static const int kIndicesPerDash = 6;
SkSTArray<1, LineData, true> fLines;
- GrColor fColor;
+ GrColor4h fColor;
bool fDisallowCombineOnTouchOrOverlap : 1;
bool fUsesLocalCoords : 1;
bool fFullDash : 1;
@@ -834,7 +834,7 @@
public:
typedef SkPathEffect::DashInfo DashInfo;
- static sk_sp<GrGeometryProcessor> Make(GrColor,
+ static sk_sp<GrGeometryProcessor> Make(GrColor4h,
AAMode aaMode,
const SkMatrix& localMatrix,
bool usesLocalCoords);
@@ -843,7 +843,7 @@
AAMode aaMode() const { return fAAMode; }
- GrColor color() const { return fColor; }
+ GrColor4h color() const { return fColor; }
const SkMatrix& localMatrix() const { return fLocalMatrix; }
@@ -854,14 +854,14 @@
GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const override;
private:
- DashingCircleEffect(GrColor, AAMode aaMode, const SkMatrix& localMatrix,
+ DashingCircleEffect(GrColor4h, AAMode aaMode, const SkMatrix& localMatrix,
bool usesLocalCoords);
const Attribute& onVertexAttribute(int i) const override {
return IthAttribute(i, kInPosition, kInDashParams, kInCircleParams);
}
- GrColor fColor;
+ GrColor4h fColor;
SkMatrix fLocalMatrix;
bool fUsesLocalCoords;
AAMode fAAMode;
@@ -899,7 +899,7 @@
private:
UniformHandle fParamUniform;
UniformHandle fColorUniform;
- GrColor fColor;
+ GrColor4h fColor;
SkScalar fPrevRadius;
SkScalar fPrevCenterX;
SkScalar fPrevIntervalLength;
@@ -907,7 +907,7 @@
};
GLDashingCircleEffect::GLDashingCircleEffect() {
- fColor = GrColor_ILLEGAL;
+ fColor = GrColor4h_ILLEGAL;
fPrevRadius = SK_ScalarMin;
fPrevCenterX = SK_ScalarMin;
fPrevIntervalLength = SK_ScalarMax;
@@ -971,7 +971,7 @@
const DashingCircleEffect& dce = processor.cast<DashingCircleEffect>();
if (dce.color() != fColor) {
float c[4];
- GrColorToRGBAFloat(dce.color(), c);
+ dce.color().toFloats(c);
pdman.set4fv(fColorUniform, 1, c);
fColor = dce.color();
}
@@ -990,7 +990,7 @@
//////////////////////////////////////////////////////////////////////////////
-sk_sp<GrGeometryProcessor> DashingCircleEffect::Make(GrColor color,
+sk_sp<GrGeometryProcessor> DashingCircleEffect::Make(GrColor4h color,
AAMode aaMode,
const SkMatrix& localMatrix,
bool usesLocalCoords) {
@@ -1007,7 +1007,7 @@
return new GLDashingCircleEffect();
}
-DashingCircleEffect::DashingCircleEffect(GrColor color,
+DashingCircleEffect::DashingCircleEffect(GrColor4h color,
AAMode aaMode,
const SkMatrix& localMatrix,
bool usesLocalCoords)
@@ -1024,9 +1024,9 @@
#if GR_TEST_UTILS
sk_sp<GrGeometryProcessor> DashingCircleEffect::TestCreate(GrProcessorTestData* d) {
AAMode aaMode = static_cast<AAMode>(d->fRandom->nextULessThan(GrDashOp::kAAModeCnt));
- return DashingCircleEffect::Make(GrRandomColor(d->fRandom),
- aaMode, GrTest::TestMatrix(d->fRandom),
- d->fRandom->nextBool());
+ return DashingCircleEffect::Make(GrColor4h::FromGrColor(GrRandomColor(d->fRandom)),
+ aaMode, GrTest::TestMatrix(d->fRandom),
+ d->fRandom->nextBool());
}
#endif
@@ -1047,7 +1047,7 @@
public:
typedef SkPathEffect::DashInfo DashInfo;
- static sk_sp<GrGeometryProcessor> Make(GrColor,
+ static sk_sp<GrGeometryProcessor> Make(GrColor4h,
AAMode aaMode,
const SkMatrix& localMatrix,
bool usesLocalCoords);
@@ -1056,7 +1056,7 @@
AAMode aaMode() const { return fAAMode; }
- GrColor color() const { return fColor; }
+ GrColor4h color() const { return fColor; }
const SkMatrix& localMatrix() const { return fLocalMatrix; }
@@ -1067,14 +1067,14 @@
GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const override;
private:
- DashingLineEffect(GrColor, AAMode aaMode, const SkMatrix& localMatrix,
+ DashingLineEffect(GrColor4h, AAMode aaMode, const SkMatrix& localMatrix,
bool usesLocalCoords);
const Attribute& onVertexAttribute(int i) const override {
return IthAttribute(i, kInPosition, kInDashParams, kInRectParams);
}
- GrColor fColor;
+ GrColor4h fColor;
SkMatrix fLocalMatrix;
bool fUsesLocalCoords;
AAMode fAAMode;
@@ -1112,12 +1112,12 @@
FPCoordTransformIter&& iter) override;
private:
- GrColor fColor;
+ GrColor4h fColor;
UniformHandle fColorUniform;
typedef GrGLSLGeometryProcessor INHERITED;
};
-GLDashingLineEffect::GLDashingLineEffect() : fColor(GrColor_ILLEGAL) {}
+GLDashingLineEffect::GLDashingLineEffect() : fColor(GrColor4h_ILLEGAL) {}
void GLDashingLineEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
const DashingLineEffect& de = args.fGP.cast<DashingLineEffect>();
@@ -1197,7 +1197,7 @@
const DashingLineEffect& de = processor.cast<DashingLineEffect>();
if (de.color() != fColor) {
float c[4];
- GrColorToRGBAFloat(de.color(), c);
+ de.color().toFloats(c);
pdman.set4fv(fColorUniform, 1, c);
fColor = de.color();
}
@@ -1216,7 +1216,7 @@
//////////////////////////////////////////////////////////////////////////////
-sk_sp<GrGeometryProcessor> DashingLineEffect::Make(GrColor color,
+sk_sp<GrGeometryProcessor> DashingLineEffect::Make(GrColor4h color,
AAMode aaMode,
const SkMatrix& localMatrix,
bool usesLocalCoords) {
@@ -1233,7 +1233,7 @@
return new GLDashingLineEffect();
}
-DashingLineEffect::DashingLineEffect(GrColor color,
+DashingLineEffect::DashingLineEffect(GrColor4h color,
AAMode aaMode,
const SkMatrix& localMatrix,
bool usesLocalCoords)
@@ -1250,7 +1250,7 @@
#if GR_TEST_UTILS
sk_sp<GrGeometryProcessor> DashingLineEffect::TestCreate(GrProcessorTestData* d) {
AAMode aaMode = static_cast<AAMode>(d->fRandom->nextULessThan(GrDashOp::kAAModeCnt));
- return DashingLineEffect::Make(GrRandomColor(d->fRandom),
+ return DashingLineEffect::Make(GrColor4h::FromGrColor(GrRandomColor(d->fRandom)),
aaMode, GrTest::TestMatrix(d->fRandom),
d->fRandom->nextBool());
}
@@ -1258,7 +1258,7 @@
#endif
//////////////////////////////////////////////////////////////////////////////
-static sk_sp<GrGeometryProcessor> make_dash_gp(GrColor color,
+static sk_sp<GrGeometryProcessor> make_dash_gp(GrColor4h color,
AAMode aaMode,
DashCap cap,
const SkMatrix& viewMatrix,
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index 0bff89c..f542961 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -363,7 +363,7 @@
SkString dumpInfo() const override {
SkString string;
- string.appendf("Color: 0x%08x Count: %d\n", fColor, fPaths.count());
+ string.appendf("Color: 0x%08x Count: %d\n", fColor.toGrColor(), fPaths.count());
for (const auto& path : fPaths) {
string.appendf("Tolerance: %.2f\n", path.fTolerance);
}
@@ -372,7 +372,7 @@
return string;
}
- DefaultPathOp(const Helper::MakeArgs& helperArgs, GrColor color, const SkPath& path,
+ DefaultPathOp(const Helper::MakeArgs& helperArgs, GrColor4h color, const SkPath& path,
SkScalar tolerance, uint8_t coverage, const SkMatrix& viewMatrix, bool isHairline,
GrAAType aaType, const SkRect& devBounds,
const GrUserStencilSettings* stencilSettings)
@@ -465,7 +465,7 @@
return CombineResult::kMerged;
}
- GrColor color() const { return fColor; }
+ GrColor4h color() const { return fColor; }
uint8_t coverage() const { return fCoverage; }
const SkMatrix& viewMatrix() const { return fViewMatrix; }
bool isHairline() const { return fIsHairline; }
@@ -477,7 +477,7 @@
SkSTArray<1, PathData, true> fPaths;
Helper fHelper;
- GrColor fColor;
+ GrColor4h fColor;
uint8_t fCoverage;
SkMatrix fViewMatrix;
bool fIsHairline;
diff --git a/src/gpu/ops/GrDrawAtlasOp.cpp b/src/gpu/ops/GrDrawAtlasOp.cpp
index c4b44aa..691299a 100644
--- a/src/gpu/ops/GrDrawAtlasOp.cpp
+++ b/src/gpu/ops/GrDrawAtlasOp.cpp
@@ -15,7 +15,7 @@
static sk_sp<GrGeometryProcessor> make_gp(const GrShaderCaps* shaderCaps,
bool hasColors,
- GrColor color,
+ GrColor4h color,
const SkMatrix& viewMatrix) {
using namespace GrDefaultGeoProcFactory;
Color gpColor(color);
@@ -27,7 +27,7 @@
LocalCoords::kHasExplicit_Type, viewMatrix);
}
-GrDrawAtlasOp::GrDrawAtlasOp(const Helper::MakeArgs& helperArgs, GrColor color,
+GrDrawAtlasOp::GrDrawAtlasOp(const Helper::MakeArgs& helperArgs, GrColor4h color,
const SkMatrix& viewMatrix, GrAAType aaType, int spriteCount,
const SkRSXform* xforms, const SkRect* rects, const SkColor* colors)
: INHERITED(ClassID()), fHelper(helperArgs, aaType), fColor(color) {
@@ -55,7 +55,8 @@
uint8_t* currVertex = installedGeo.fVerts.begin();
SkRect bounds = SkRectPriv::MakeLargestInverted();
- int paintAlpha = GrColorUnpackA(installedGeo.fColor);
+ // TODO4F: Preserve float colors
+ int paintAlpha = GrColorUnpackA(installedGeo.fColor.toGrColor());
for (int spriteIndex = 0; spriteIndex < spriteCount; ++spriteIndex) {
// Transform rect
SkPoint strip[4];
@@ -111,7 +112,7 @@
SkString GrDrawAtlasOp::dumpInfo() const {
SkString string;
for (const auto& geo : fGeoData) {
- string.appendf("Color: 0x%08x, Quads: %d\n", geo.fColor, geo.fVerts.count() / 4);
+ string.appendf("Color: 0x%08x, Quads: %d\n", geo.fColor.toGrColor(), geo.fVerts.count()/4);
}
string += fHelper.dumpInfo();
string += INHERITED::dumpInfo();
diff --git a/src/gpu/ops/GrDrawAtlasOp.h b/src/gpu/ops/GrDrawAtlasOp.h
index fdb3476..97fb169 100644
--- a/src/gpu/ops/GrDrawAtlasOp.h
+++ b/src/gpu/ops/GrDrawAtlasOp.h
@@ -32,7 +32,7 @@
spriteCount, xforms, rects, colors);
}
- GrDrawAtlasOp(const Helper::MakeArgs& helperArgs, GrColor color, const SkMatrix& viewMatrix,
+ GrDrawAtlasOp(const Helper::MakeArgs& helperArgs, GrColor4h color, const SkMatrix& viewMatrix,
GrAAType, int spriteCount, const SkRSXform* xforms, const SkRect* rects,
const SkColor* colors);
@@ -51,7 +51,7 @@
private:
void onPrepareDraws(Target*) override;
- GrColor color() const { return fColor; }
+ GrColor4h color() const { return fColor; }
const SkMatrix& viewMatrix() const { return fViewMatrix; }
bool hasColors() const { return fHasColors; }
int quadCount() const { return fQuadCount; }
@@ -59,14 +59,14 @@
CombineResult onCombineIfPossible(GrOp* t, const GrCaps&) override;
struct Geometry {
- GrColor fColor;
+ GrColor4h fColor;
SkTArray<uint8_t, true> fVerts;
};
SkSTArray<1, Geometry, true> fGeoData;
Helper fHelper;
SkMatrix fViewMatrix;
- GrColor fColor;
+ GrColor4h fColor;
int fQuadCount;
bool fHasColors;
diff --git a/src/gpu/ops/GrDrawPathOp.cpp b/src/gpu/ops/GrDrawPathOp.cpp
index cc8a86d..4e75b57 100644
--- a/src/gpu/ops/GrDrawPathOp.cpp
+++ b/src/gpu/ops/GrDrawPathOp.cpp
@@ -16,7 +16,7 @@
GrPathRendering::FillType fill, GrAAType aaType)
: INHERITED(classID)
, fViewMatrix(viewMatrix)
- , fInputColor(paint.getColor())
+ , fInputColor(GrColor4h::FromFloats(paint.getColor4f().vec()))
, fFillType(fill)
, fAAType(aaType)
, fProcessorSet(std::move(paint)) {}
diff --git a/src/gpu/ops/GrDrawPathOp.h b/src/gpu/ops/GrDrawPathOp.h
index cdd955e..8395118 100644
--- a/src/gpu/ops/GrDrawPathOp.h
+++ b/src/gpu/ops/GrDrawPathOp.h
@@ -40,7 +40,7 @@
protected:
const SkMatrix& viewMatrix() const { return fViewMatrix; }
- GrColor color() const { return fInputColor; }
+ GrColor4h color() const { return fInputColor; }
GrPathRendering::FillType fillType() const { return fFillType; }
const GrProcessorSet& processors() const { return fProcessorSet; }
GrProcessorSet detachProcessors() { return std::move(fProcessorSet); }
@@ -61,7 +61,7 @@
void onPrepare(GrOpFlushState*) final {}
SkMatrix fViewMatrix;
- GrColor fInputColor;
+ GrColor4h fInputColor;
GrProcessorSet::Analysis fAnalysis;
GrPathRendering::FillType fFillType;
GrAAType fAAType;
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index da8eb3a..10ff9da 100644
--- a/src/gpu/ops/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
@@ -29,7 +29,7 @@
std::move(colorSpaceXform), viewMatrix);
}
-GrDrawVerticesOp::GrDrawVerticesOp(const Helper::MakeArgs& helperArgs, GrColor color,
+GrDrawVerticesOp::GrDrawVerticesOp(const Helper::MakeArgs& helperArgs, GrColor4h color,
sk_sp<SkVertices> vertices, const SkVertices::Bone bones[],
int boneCount, GrPrimitiveType primitiveType, GrAAType aaType,
sk_sp<GrColorSpaceXform> colorSpaceXform,
@@ -426,6 +426,9 @@
}
size_t boneWeightOffset = offset;
+ // TODO4F: Preserve float colors
+ GrColor color = mesh.fColor.toGrColor();
+
for (int j = 0; j < vertexCount; ++j) {
if (this->hasMultipleViewMatrices()) {
mesh.fViewMatrix.mapPoints(((SkPoint*)verts), &positions[j], 1);
@@ -436,7 +439,7 @@
if (mesh.hasPerVertexColors()) {
*(uint32_t*)((intptr_t)verts + kColorOffset) = colors[j];
} else {
- *(uint32_t*)((intptr_t)verts + kColorOffset) = mesh.fColor;
+ *(uint32_t*)((intptr_t)verts + kColorOffset) = color;
}
}
if (hasLocalCoordsAttribute) {
diff --git a/src/gpu/ops/GrDrawVerticesOp.h b/src/gpu/ops/GrDrawVerticesOp.h
index 79a8309..17ea563 100644
--- a/src/gpu/ops/GrDrawVerticesOp.h
+++ b/src/gpu/ops/GrDrawVerticesOp.h
@@ -45,7 +45,7 @@
sk_sp<GrColorSpaceXform>,
GrPrimitiveType* overridePrimType = nullptr);
- GrDrawVerticesOp(const Helper::MakeArgs&, GrColor, sk_sp<SkVertices>,
+ GrDrawVerticesOp(const Helper::MakeArgs&, GrColor4h, sk_sp<SkVertices>,
const SkVertices::Bone bones[], int boneCount, GrPrimitiveType, GrAAType,
sk_sp<GrColorSpaceXform>, const SkMatrix& viewMatrix);
@@ -101,7 +101,7 @@
CombineResult onCombineIfPossible(GrOp* t, const GrCaps&) override;
struct Mesh {
- GrColor fColor; // Used if this->hasPerVertexColors() is false.
+ GrColor4h fColor; // Used if this->hasPerVertexColors() is false.
sk_sp<SkVertices> fVertices;
SkMatrix fViewMatrix;
bool fIgnoreTexCoords;
diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
index 79a9062..d997b48 100644
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@@ -151,7 +151,7 @@
std::move(iter), dst);
}
- NonAALatticeOp(Helper::MakeArgs& helperArgs, GrColor color, const SkMatrix& viewMatrix,
+ NonAALatticeOp(Helper::MakeArgs& helperArgs, GrColor4h color, const SkMatrix& viewMatrix,
sk_sp<GrTextureProxy> proxy, sk_sp<GrColorSpaceXform> colorSpaceXform,
GrSamplerState::Filter filter, std::unique_ptr<SkLatticeIter> iter,
const SkRect& dst)
@@ -182,8 +182,8 @@
for (int i = 0; i < fPatches.count(); ++i) {
str.appendf("%d: Color: 0x%08x Dst [L: %.2f, T: %.2f, R: %.2f, B: %.2f]\n", i,
- fPatches[i].fColor, fPatches[i].fDst.fLeft, fPatches[i].fDst.fTop,
- fPatches[i].fDst.fRight, fPatches[i].fDst.fBottom);
+ fPatches[i].fColor.toGrColor(), fPatches[i].fDst.fLeft,
+ fPatches[i].fDst.fTop, fPatches[i].fDst.fRight, fPatches[i].fDst.fBottom);
}
str += fHelper.dumpInfo();
@@ -194,7 +194,7 @@
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- auto opaque = GrColorIsOpaque(fPatches[0].fColor) && GrPixelConfigIsOpaque(fProxy->config())
+ auto opaque = fPatches[0].fColor.isOpaque() && GrPixelConfigIsOpaque(fProxy->config())
? GrProcessorAnalysisColor::Opaque::kYes
: GrProcessorAnalysisColor::Opaque::kNo;
auto analysisColor = GrProcessorAnalysisColor(opaque);
@@ -238,6 +238,8 @@
intptr_t verts = reinterpret_cast<intptr_t>(vertices);
for (int i = 0; i < patchCnt; i++) {
const Patch& patch = fPatches[i];
+ // TODO4F: Preserve float colors
+ GrColor patchColor = patch.fColor.toGrColor();
// Apply the view matrix here if it is scale-translate. Otherwise, we need to
// wait until we've created the dst rects.
@@ -273,7 +275,7 @@
}
for (int j = 0; j < kVertsPerRect; ++j) {
- vertices[j].fColor = patch.fColor;
+ vertices[j].fColor = patchColor;
}
verts += kVertsPerRect * kVertexStide;
}
@@ -313,7 +315,7 @@
SkMatrix fViewMatrix;
std::unique_ptr<SkLatticeIter> fIter;
SkRect fDst;
- GrColor fColor;
+ GrColor4h fColor;
};
Helper fHelper;
diff --git a/src/gpu/ops/GrNonAAFillRectOp.cpp b/src/gpu/ops/GrNonAAFillRectOp.cpp
index b8b4a73..ae28114 100644
--- a/src/gpu/ops/GrNonAAFillRectOp.cpp
+++ b/src/gpu/ops/GrNonAAFillRectOp.cpp
@@ -125,7 +125,7 @@
NonAAFillRectOp() = delete;
- NonAAFillRectOp(const Helper::MakeArgs& args, GrColor color, const SkMatrix& viewMatrix,
+ NonAAFillRectOp(const Helper::MakeArgs& args, GrColor4h color, const SkMatrix& viewMatrix,
const SkRect& rect, const SkRect* localRect, const SkMatrix* localMatrix,
GrAAType aaType, const GrUserStencilSettings* stencilSettings)
: INHERITED(ClassID()), fHelper(args, aaType, stencilSettings) {
@@ -160,8 +160,8 @@
for (int i = 0; i < fRects.count(); ++i) {
const RectInfo& info = fRects[i];
str.appendf("%d: Color: 0x%08x, Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f]\n", i,
- info.fColor, info.fRect.fLeft, info.fRect.fTop, info.fRect.fRight,
- info.fRect.fBottom);
+ info.fColor.toGrColor(), info.fRect.fLeft, info.fRect.fTop,
+ info.fRect.fRight, info.fRect.fBottom);
}
str += fHelper.dumpInfo();
str += INHERITED::dumpInfo();
@@ -169,7 +169,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor* color = &fRects.front().fColor;
+ GrColor4h* color = &fRects.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kNone, color);
}
@@ -203,7 +203,8 @@
for (int i = 0; i < rectCount; i++) {
intptr_t verts =
reinterpret_cast<intptr_t>(vertices) + i * kVertsPerRect * kVertexStride;
- tesselate(verts, kVertexStride, fRects[i].fColor, &fRects[i].fViewMatrix,
+ // TODO4F: Preserve float colors
+ tesselate(verts, kVertexStride, fRects[i].fColor.toGrColor(), &fRects[i].fViewMatrix,
fRects[i].fRect, &fRects[i].fLocalQuad);
}
auto pipe = fHelper.makePipeline(target);
@@ -220,7 +221,7 @@
}
struct RectInfo {
- GrColor fColor;
+ GrColor4h fColor;
SkMatrix fViewMatrix;
SkRect fRect;
GrQuad fLocalQuad;
@@ -254,7 +255,7 @@
NonAAFillRectPerspectiveOp() = delete;
- NonAAFillRectPerspectiveOp(const Helper::MakeArgs& args, GrColor color,
+ NonAAFillRectPerspectiveOp(const Helper::MakeArgs& args, GrColor4h color,
const SkMatrix& viewMatrix, const SkRect& rect,
const SkRect* localRect, const SkMatrix* localMatrix,
GrAAType aaType, const GrUserStencilSettings* stencilSettings)
@@ -288,8 +289,8 @@
for (int i = 0; i < fRects.count(); ++i) {
const RectInfo& geo = fRects[i];
str.appendf("%d: Color: 0x%08x, Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f]\n", i,
- geo.fColor, geo.fRect.fLeft, geo.fRect.fTop, geo.fRect.fRight,
- geo.fRect.fBottom);
+ geo.fColor.toGrColor(), geo.fRect.fLeft, geo.fRect.fTop,
+ geo.fRect.fRight, geo.fRect.fBottom);
}
str += fHelper.dumpInfo();
str += INHERITED::dumpInfo();
@@ -297,7 +298,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor* color = &fRects.front().fColor;
+ GrColor4h* color = &fRects.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kNone, color);
}
@@ -334,13 +335,15 @@
for (int i = 0; i < rectCount; i++) {
const RectInfo& info = fRects[i];
+ // TODO4F: Preserve float colors
+ GrColor color = info.fColor.toGrColor();
intptr_t verts =
reinterpret_cast<intptr_t>(vertices) + i * kVertsPerRect * vertexStride;
if (fHasLocalRect) {
GrQuad quad(info.fLocalRect);
- tesselate(verts, vertexStride, info.fColor, nullptr, info.fRect, &quad);
+ tesselate(verts, vertexStride, color, nullptr, info.fRect, &quad);
} else {
- tesselate(verts, vertexStride, info.fColor, nullptr, info.fRect, nullptr);
+ tesselate(verts, vertexStride, color, nullptr, info.fRect, nullptr);
}
}
auto pipe = fHelper.makePipeline(target);
@@ -370,7 +373,7 @@
struct RectInfo {
SkRect fRect;
- GrColor fColor;
+ GrColor4h fColor;
SkRect fLocalRect;
};
diff --git a/src/gpu/ops/GrNonAAStrokeRectOp.cpp b/src/gpu/ops/GrNonAAStrokeRectOp.cpp
index e7b2b17..7ace398 100644
--- a/src/gpu/ops/GrNonAAStrokeRectOp.cpp
+++ b/src/gpu/ops/GrNonAAStrokeRectOp.cpp
@@ -72,7 +72,8 @@
string.appendf(
"Color: 0x%08x, Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f], "
"StrokeWidth: %.2f\n",
- fColor, fRect.fLeft, fRect.fTop, fRect.fRight, fRect.fBottom, fStrokeWidth);
+ fColor.toGrColor(), fRect.fLeft, fRect.fTop, fRect.fRight, fRect.fBottom,
+ fStrokeWidth);
string += fHelper.dumpInfo();
string += INHERITED::dumpInfo();
return string;
@@ -99,7 +100,7 @@
stroke, aaType);
}
- NonAAStrokeRectOp(const Helper::MakeArgs& helperArgs, GrColor color, Helper::Flags flags,
+ NonAAStrokeRectOp(const Helper::MakeArgs& helperArgs, GrColor4h color, Helper::Flags flags,
const SkMatrix& viewMatrix, const SkRect& rect, const SkStrokeRec& stroke,
GrAAType aaType)
: INHERITED(ClassID()), fHelper(helperArgs, aaType, flags) {
@@ -198,7 +199,7 @@
// TODO: override onCombineIfPossible
Helper fHelper;
- GrColor fColor;
+ GrColor4h fColor;
SkMatrix fViewMatrix;
SkRect fRect;
SkScalar fStrokeWidth;
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index 6df0cb4..8826d60 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -957,7 +957,7 @@
radius, style, arcParams);
}
- CircleOp(const Helper::MakeArgs& helperArgs, GrColor color, const SkMatrix& viewMatrix,
+ CircleOp(const Helper::MakeArgs& helperArgs, GrColor4h color, const SkMatrix& viewMatrix,
SkPoint center, SkScalar radius, const GrStyle& style, const ArcParams* arcParams)
: GrMeshDrawOp(ClassID()), fHelper(helperArgs, GrAAType::kCoverage) {
const SkStrokeRec& stroke = style.strokeRec();
@@ -1147,9 +1147,10 @@
string.appendf(
"Color: 0x%08x Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f],"
"InnerRad: %.2f, OuterRad: %.2f\n",
- fCircles[i].fColor, fCircles[i].fDevBounds.fLeft, fCircles[i].fDevBounds.fTop,
- fCircles[i].fDevBounds.fRight, fCircles[i].fDevBounds.fBottom,
- fCircles[i].fInnerRadius, fCircles[i].fOuterRadius);
+ fCircles[i].fColor.toGrColor(), fCircles[i].fDevBounds.fLeft,
+ fCircles[i].fDevBounds.fTop, fCircles[i].fDevBounds.fRight,
+ fCircles[i].fDevBounds.fBottom, fCircles[i].fInnerRadius,
+ fCircles[i].fOuterRadius);
}
string += fHelper.dumpInfo();
string += INHERITED::dumpInfo();
@@ -1157,7 +1158,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor* color = &fCircles.front().fColor;
+ GrColor4h* color = &fCircles.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kSingleChannel,
color);
}
@@ -1216,7 +1217,8 @@
for (const auto& circle : fCircles) {
SkScalar innerRadius = circle.fInnerRadius;
SkScalar outerRadius = circle.fOuterRadius;
- GrColor color = circle.fColor;
+ // TODO4F: Preserve float colors
+ GrColor color = circle.fColor.toGrColor();
const SkRect& bounds = circle.fDevBounds;
CircleVertex* v0 = reinterpret_cast<CircleVertex*>(vertices + 0 * vertexStride);
@@ -1526,7 +1528,7 @@
}
struct Circle {
- GrColor fColor;
+ GrColor4h fColor;
SkScalar fInnerRadius;
SkScalar fOuterRadius;
SkScalar fClipPlane[3];
@@ -1575,7 +1577,7 @@
onAngle, offAngle, phaseAngle);
}
- ButtCapDashedCircleOp(const Helper::MakeArgs& helperArgs, GrColor color,
+ ButtCapDashedCircleOp(const Helper::MakeArgs& helperArgs, GrColor4h color,
const SkMatrix& viewMatrix, SkPoint center, SkScalar radius,
SkScalar strokeWidth, SkScalar startAngle, SkScalar onAngle,
SkScalar offAngle, SkScalar phaseAngle)
@@ -1660,10 +1662,11 @@
"Color: 0x%08x Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f],"
"InnerRad: %.2f, OuterRad: %.2f, OnAngle: %.2f, TotalAngle: %.2f, "
"Phase: %.2f\n",
- fCircles[i].fColor, fCircles[i].fDevBounds.fLeft, fCircles[i].fDevBounds.fTop,
- fCircles[i].fDevBounds.fRight, fCircles[i].fDevBounds.fBottom,
- fCircles[i].fInnerRadius, fCircles[i].fOuterRadius, fCircles[i].fOnAngle,
- fCircles[i].fTotalAngle, fCircles[i].fPhaseAngle);
+ fCircles[i].fColor.toGrColor(), fCircles[i].fDevBounds.fLeft,
+ fCircles[i].fDevBounds.fTop, fCircles[i].fDevBounds.fRight,
+ fCircles[i].fDevBounds.fBottom, fCircles[i].fInnerRadius,
+ fCircles[i].fOuterRadius, fCircles[i].fOnAngle, fCircles[i].fTotalAngle,
+ fCircles[i].fPhaseAngle);
}
string += fHelper.dumpInfo();
string += INHERITED::dumpInfo();
@@ -1671,7 +1674,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor* color = &fCircles.front().fColor;
+ GrColor4h* color = &fCircles.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kSingleChannel,
color);
}
@@ -1734,12 +1737,15 @@
totalAngle = -totalAngle;
}
+ // TODO4F: Preserve float colors
+ GrColor color = circle.fColor.toGrColor();
+
// The bounding geometry for the circle is composed of an outer bounding octagon and
// an inner bounded octagon.
// Initializes the attributes that are the same at each vertex. Also applies reflection.
auto init_const_attrs_and_reflect = [&](CircleVertex* v) {
- v->fColor = circle.fColor;
+ v->fColor = color;
v->fOuterRadius = circle.fOuterRadius;
v->fInnerRadius = normInnerRadius;
v->fOnAngle = circle.fOnAngle;
@@ -1835,7 +1841,7 @@
}
struct Circle {
- GrColor fColor;
+ GrColor4h fColor;
SkScalar fOuterRadius;
SkScalar fInnerRadius;
SkScalar fOnAngle;
@@ -1937,7 +1943,7 @@
params, stroke);
}
- EllipseOp(const Helper::MakeArgs& helperArgs, GrColor color, const SkMatrix& viewMatrix,
+ EllipseOp(const Helper::MakeArgs& helperArgs, GrColor4h color, const SkMatrix& viewMatrix,
const DeviceSpaceParams& params, const SkStrokeRec& stroke)
: INHERITED(ClassID()), fHelper(helperArgs, GrAAType::kCoverage) {
SkStrokeRec::Style style = stroke.getStyle();
@@ -1973,9 +1979,9 @@
string.appendf(
"Color: 0x%08x Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f], "
"XRad: %.2f, YRad: %.2f, InnerXRad: %.2f, InnerYRad: %.2f\n",
- geo.fColor, geo.fDevBounds.fLeft, geo.fDevBounds.fTop, geo.fDevBounds.fRight,
- geo.fDevBounds.fBottom, geo.fXRadius, geo.fYRadius, geo.fInnerXRadius,
- geo.fInnerYRadius);
+ geo.fColor.toGrColor(), geo.fDevBounds.fLeft, geo.fDevBounds.fTop,
+ geo.fDevBounds.fRight, geo.fDevBounds.fBottom, geo.fXRadius, geo.fYRadius,
+ geo.fInnerXRadius, geo.fInnerYRadius);
}
string += fHelper.dumpInfo();
string += INHERITED::dumpInfo();
@@ -1983,7 +1989,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor* color = &fEllipses.front().fColor;
+ GrColor4h* color = &fEllipses.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kSingleChannel,
color);
}
@@ -2008,7 +2014,8 @@
}
for (const auto& ellipse : fEllipses) {
- GrColor color = ellipse.fColor;
+ // TODO4F: Preserve float colors
+ GrColor color = ellipse.fColor.toGrColor();
SkScalar xRadius = ellipse.fXRadius;
SkScalar yRadius = ellipse.fYRadius;
@@ -2079,7 +2086,7 @@
}
struct Ellipse {
- GrColor fColor;
+ GrColor4h fColor;
SkScalar fXRadius;
SkScalar fYRadius;
SkScalar fInnerXRadius;
@@ -2174,7 +2181,7 @@
return Helper::FactoryHelper<DIEllipseOp>(context, std::move(paint), params, viewMatrix);
}
- DIEllipseOp(Helper::MakeArgs& helperArgs, GrColor color, const DeviceSpaceParams& params,
+ DIEllipseOp(Helper::MakeArgs& helperArgs, GrColor4h color, const DeviceSpaceParams& params,
const SkMatrix& viewMatrix)
: INHERITED(ClassID()), fHelper(helperArgs, GrAAType::kCoverage) {
// This expands the outer rect so that after CTM we end up with a half-pixel border
@@ -2209,9 +2216,9 @@
"Color: 0x%08x Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f], XRad: %.2f, "
"YRad: %.2f, InnerXRad: %.2f, InnerYRad: %.2f, GeoDX: %.2f, "
"GeoDY: %.2f\n",
- geo.fColor, geo.fBounds.fLeft, geo.fBounds.fTop, geo.fBounds.fRight,
- geo.fBounds.fBottom, geo.fXRadius, geo.fYRadius, geo.fInnerXRadius,
- geo.fInnerYRadius, geo.fGeoDx, geo.fGeoDy);
+ geo.fColor.toGrColor(), geo.fBounds.fLeft, geo.fBounds.fTop,
+ geo.fBounds.fRight, geo.fBounds.fBottom, geo.fXRadius, geo.fYRadius,
+ geo.fInnerXRadius, geo.fInnerYRadius, geo.fGeoDx, geo.fGeoDy);
}
string += fHelper.dumpInfo();
string += INHERITED::dumpInfo();
@@ -2219,7 +2226,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor* color = &fEllipses.front().fColor;
+ GrColor4h* color = &fEllipses.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kSingleChannel,
color);
}
@@ -2240,7 +2247,8 @@
}
for (const auto& ellipse : fEllipses) {
- GrColor color = ellipse.fColor;
+ // TODO4F: Preserve float colors
+ GrColor color = ellipse.fColor.toGrColor();
SkScalar xRadius = ellipse.fXRadius;
SkScalar yRadius = ellipse.fYRadius;
@@ -2314,7 +2322,7 @@
struct Ellipse {
SkMatrix fViewMatrix;
- GrColor fColor;
+ GrColor4h fColor;
SkScalar fXRadius;
SkScalar fYRadius;
SkScalar fInnerXRadius;
@@ -2477,7 +2485,7 @@
devRect, devRadius,
devStrokeWidth, strokeOnly);
}
- CircularRRectOp(Helper::MakeArgs& helperArgs, GrColor color, const SkMatrix& viewMatrix,
+ CircularRRectOp(Helper::MakeArgs& helperArgs, GrColor4h color, const SkMatrix& viewMatrix,
const SkRect& devRect, float devRadius, float devStrokeWidth, bool strokeOnly)
: INHERITED(ClassID())
, fViewMatrixIfUsingLocalCoords(viewMatrix)
@@ -2540,9 +2548,10 @@
string.appendf(
"Color: 0x%08x Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f],"
"InnerRad: %.2f, OuterRad: %.2f\n",
- fRRects[i].fColor, fRRects[i].fDevBounds.fLeft, fRRects[i].fDevBounds.fTop,
- fRRects[i].fDevBounds.fRight, fRRects[i].fDevBounds.fBottom,
- fRRects[i].fInnerRadius, fRRects[i].fOuterRadius);
+ fRRects[i].fColor.toGrColor(), fRRects[i].fDevBounds.fLeft,
+ fRRects[i].fDevBounds.fTop, fRRects[i].fDevBounds.fRight,
+ fRRects[i].fDevBounds.fBottom, fRRects[i].fInnerRadius,
+ fRRects[i].fOuterRadius);
}
string += fHelper.dumpInfo();
string += INHERITED::dumpInfo();
@@ -2550,7 +2559,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor* color = &fRRects.front().fColor;
+ GrColor4h* color = &fRRects.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kSingleChannel,
color);
}
@@ -2666,7 +2675,8 @@
int currStartVertex = 0;
for (const auto& rrect : fRRects) {
- GrColor color = rrect.fColor;
+ // TODO4F: Preserve float colors
+ GrColor color = rrect.fColor.toGrColor();
SkScalar outerRadius = rrect.fOuterRadius;
const SkRect& bounds = rrect.fDevBounds;
@@ -2725,7 +2735,7 @@
SkScalar maxOffset = -rrect.fInnerRadius / overstrokeOuterRadius;
FillInOverstrokeVerts(&verts, bounds, outerRadius, overstrokeOuterRadius, maxOffset,
- overstrokeOuterRadius, 0.0f, rrect.fColor);
+ overstrokeOuterRadius, 0.0f, color);
}
const uint16_t* primIndices = rrect_type_to_indices(rrect.fType);
@@ -2770,7 +2780,7 @@
}
struct RRect {
- GrColor fColor;
+ GrColor4h fColor;
SkScalar fInnerRadius;
SkScalar fOuterRadius;
SkRect fDevBounds;
@@ -2861,7 +2871,7 @@
strokeOnly);
}
- EllipticalRRectOp(Helper::MakeArgs helperArgs, GrColor color, const SkMatrix& viewMatrix,
+ EllipticalRRectOp(Helper::MakeArgs helperArgs, GrColor4h color, const SkMatrix& viewMatrix,
const SkRect& devRect, float devXRadius, float devYRadius,
SkVector devStrokeHalfWidths, bool strokeOnly)
: INHERITED(ClassID()), fHelper(helperArgs, GrAAType::kCoverage) {
@@ -2904,9 +2914,9 @@
string.appendf(
"Color: 0x%08x Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f], "
"XRad: %.2f, YRad: %.2f, InnerXRad: %.2f, InnerYRad: %.2f\n",
- geo.fColor, geo.fDevBounds.fLeft, geo.fDevBounds.fTop, geo.fDevBounds.fRight,
- geo.fDevBounds.fBottom, geo.fXRadius, geo.fYRadius, geo.fInnerXRadius,
- geo.fInnerYRadius);
+ geo.fColor.toGrColor(), geo.fDevBounds.fLeft, geo.fDevBounds.fTop,
+ geo.fDevBounds.fRight, geo.fDevBounds.fBottom, geo.fXRadius, geo.fYRadius,
+ geo.fInnerXRadius, geo.fInnerYRadius);
}
string += fHelper.dumpInfo();
string += INHERITED::dumpInfo();
@@ -2914,7 +2924,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor* color = &fRRects.front().fColor;
+ GrColor4h* color = &fRRects.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kSingleChannel,
color);
}
@@ -2948,7 +2958,8 @@
}
for (const auto& rrect : fRRects) {
- GrColor color = rrect.fColor;
+ // TODO4F: Preserve float colors
+ GrColor color = rrect.fColor.toGrColor();
// Compute the reciprocals of the radii here to save time in the shader
SkScalar xRadRecip = SkScalarInvert(rrect.fXRadius);
SkScalar yRadRecip = SkScalarInvert(rrect.fYRadius);
@@ -3032,7 +3043,7 @@
}
struct RRect {
- GrColor fColor;
+ GrColor4h fColor;
SkScalar fXRadius;
SkScalar fYRadius;
SkScalar fInnerXRadius;
diff --git a/src/gpu/ops/GrRegionOp.cpp b/src/gpu/ops/GrRegionOp.cpp
index 0ba2a27..6ec230f 100644
--- a/src/gpu/ops/GrRegionOp.cpp
+++ b/src/gpu/ops/GrRegionOp.cpp
@@ -70,7 +70,7 @@
aaType, stencilSettings);
}
- RegionOp(const Helper::MakeArgs& helperArgs, GrColor color, const SkMatrix& viewMatrix,
+ RegionOp(const Helper::MakeArgs& helperArgs, GrColor4h color, const SkMatrix& viewMatrix,
const SkRegion& region, GrAAType aaType, const GrUserStencilSettings* stencilSettings)
: INHERITED(ClassID())
, fHelper(helperArgs, aaType, stencilSettings)
@@ -94,7 +94,7 @@
str.appendf("# combined: %d\n", fRegions.count());
for (int i = 0; i < fRegions.count(); ++i) {
const RegionInfo& info = fRegions[i];
- str.appendf("%d: Color: 0x%08x, Region with %d rects\n", i, info.fColor,
+ str.appendf("%d: Color: 0x%08x, Region with %d rects\n", i, info.fColor.toGrColor(),
info.fRegion.computeRegionComplexity());
}
str += fHelper.dumpInfo();
@@ -139,7 +139,9 @@
intptr_t verts = reinterpret_cast<intptr_t>(vertices);
for (int i = 0; i < numRegions; i++) {
- tesselate_region(verts, kVertexStride, fRegions[i].fColor, fRegions[i].fRegion);
+ // TODO4F: Preserve float colors
+ tesselate_region(verts, kVertexStride, fRegions[i].fColor.toGrColor(),
+ fRegions[i].fRegion);
int numRectsInRegion = fRegions[i].fRegion.computeRegionComplexity();
verts += numRectsInRegion * kVertsPerInstance * kVertexStride;
}
@@ -162,7 +164,7 @@
}
struct RegionInfo {
- GrColor fColor;
+ GrColor4h fColor;
SkRegion fRegion;
};
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
index f1692e6..f542608 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
@@ -76,7 +76,7 @@
: GrProcessorAnalysisCoverage::kNone;
}
bool isMixedSamples = this->aaType() == GrAAType::kMixedSamples;
- GrColor overrideColor;
+ GrColor4h overrideColor;
analysis = fProcessors->finalize(*geometryColor, coverage, clip, isMixedSamples, caps,
&overrideColor);
if (analysis.inputColorIsOverridden()) {
@@ -94,7 +94,7 @@
GrDrawOp::RequiresDstTexture GrSimpleMeshDrawOpHelper::xpRequiresDstTexture(
const GrCaps& caps, const GrAppliedClip* clip, GrProcessorAnalysisCoverage geometryCoverage,
- GrColor* geometryColor) {
+ GrColor4h* geometryColor) {
GrProcessorAnalysisColor color = *geometryColor;
auto result = this->xpRequiresDstTexture(caps, clip, geometryCoverage, &color);
color.isConstant(geometryColor);
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
index cd72786..bb7bbe9 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
@@ -77,7 +77,7 @@
*/
GrDrawOp::RequiresDstTexture xpRequiresDstTexture(const GrCaps&, const GrAppliedClip*,
GrProcessorAnalysisCoverage geometryCoverage,
- GrColor* geometryColor);
+ GrColor4h* geometryColor);
bool usesLocalCoords() const {
SkASSERT(fDidAnalysis);
@@ -182,7 +182,7 @@
GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
MakeArgs makeArgs;
- GrColor color = paint.getColor();
+ GrColor4h color = GrColor4h::FromFloats(paint.getColor4f().vec());
if (paint.isTrivial()) {
makeArgs.fProcessorSet = nullptr;
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index f87b030..68256ff 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -242,7 +242,7 @@
stencilSettings);
}
- SmallPathOp(Helper::MakeArgs helperArgs, GrColor color, const GrShape& shape,
+ SmallPathOp(Helper::MakeArgs helperArgs, GrColor4h color, const GrShape& shape,
const SkMatrix& viewMatrix, GrDrawOpAtlas* atlas, ShapeCache* shapeCache,
ShapeDataList* shapeList, bool gammaCorrect,
const GrUserStencilSettings* stencilSettings)
@@ -284,7 +284,7 @@
SkString dumpInfo() const override {
SkString string;
for (const auto& geo : fShapes) {
- string.appendf("Color: 0x%08x\n", geo.fColor);
+ string.appendf("Color: 0x%08x\n", geo.fColor.toGrColor());
}
string += fHelper.dumpInfo();
string += INHERITED::dumpInfo();
@@ -491,8 +491,9 @@
auto uploadTarget = target->deferredUploadTarget();
fAtlas->setLastUseToken(shapeData->fID, uploadTarget->tokenTracker()->nextDrawToken());
+ // TODO4F: Preserve float colors
this->writePathVertices(
- fAtlas, offset, args.fColor, kVertexStride, args.fViewMatrix, shapeData);
+ fAtlas, offset, args.fColor.toGrColor(), kVertexStride, args.fViewMatrix, shapeData);
offset += kVerticesPerQuad * kVertexStride;
flushInfo.fInstancesToFlush++;
}
@@ -845,7 +846,7 @@
}
}
- GrColor color() const { return fShapes[0].fColor; }
+ GrColor4h color() const { return fShapes[0].fColor; }
bool usesDistanceField() const { return fUsesDistanceField; }
CombineResult onCombineIfPossible(GrOp* t, const GrCaps& caps) override {
@@ -887,9 +888,9 @@
bool fUsesDistanceField;
struct Entry {
- GrColor fColor;
- GrShape fShape;
- SkMatrix fViewMatrix;
+ GrColor4h fColor;
+ GrShape fShape;
+ SkMatrix fViewMatrix;
};
SkSTArray<1, Entry> fShapes;
diff --git a/src/gpu/ops/GrTessellatingPathRenderer.cpp b/src/gpu/ops/GrTessellatingPathRenderer.cpp
index 9235cce..f725675 100644
--- a/src/gpu/ops/GrTessellatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTessellatingPathRenderer.cpp
@@ -190,14 +190,14 @@
SkString dumpInfo() const override {
SkString string;
- string.appendf("Color 0x%08x, aa: %d\n", fColor, fAntiAlias);
+ string.appendf("Color 0x%08x, aa: %d\n", fColor.toGrColor(), fAntiAlias);
string += fHelper.dumpInfo();
string += INHERITED::dumpInfo();
return string;
}
TessellatingPathOp(Helper::MakeArgs helperArgs,
- GrColor color,
+ GrColor4h color,
const GrShape& shape,
const SkMatrix& viewMatrix,
const SkIRect& devClipBounds,
@@ -300,8 +300,10 @@
SkScalar tol = GrPathUtils::kDefaultTolerance;
bool isLinear;
DynamicVertexAllocator allocator(vertexStride, target);
+ // TODO4F: Preserve float colors
int count =
- GrTessellator::PathToTriangles(path, tol, clipBounds, &allocator, true, fColor,
+ GrTessellator::PathToTriangles(path, tol, clipBounds, &allocator, true,
+ fColor.toGrColor(),
fHelper.compatibleWithAlphaAsCoverage(), &isLinear);
if (count == 0) {
return;
@@ -367,7 +369,7 @@
}
Helper fHelper;
- GrColor fColor;
+ GrColor4h fColor;
GrShape fShape;
SkMatrix fViewMatrix;
SkIRect fDevClipBounds;