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>
diff --git a/src/atlastext/SkAtlasTextTarget.cpp b/src/atlastext/SkAtlasTextTarget.cpp
index c2f2d40..a61d647 100644
--- a/src/atlastext/SkAtlasTextTarget.cpp
+++ b/src/atlastext/SkAtlasTextTarget.cpp
@@ -210,7 +210,7 @@
void GrAtlasTextOp::finalizeForTextTarget(uint32_t color, const GrCaps& caps) {
// TODO4F: Odd handling of client colors among AtlasTextTarget and AtlasTextRenderer
- GrColor4h color4f = GrColor4h::FromGrColor(color);
+ SkPMColor4f color4f = SkPMColor4f::FromBytes_RGBA(color);
for (int i = 0; i < fGeoCount; ++i) {
fGeoData[i].fColor = color4f;
}
@@ -235,7 +235,7 @@
GrTextBlob::VertexRegenerator regenerator(
resourceProvider, fGeoData[i].fBlob, fGeoData[i].fRun, fGeoData[i].fSubRun,
fGeoData[i].fViewMatrix, fGeoData[i].fX, fGeoData[i].fY,
- fGeoData[i].fColor.toGrColor(), &context, glyphCache, atlasManager,
+ fGeoData[i].fColor.toBytes_RGBA(), &context, glyphCache, atlasManager,
&autoGlyphCache);
bool done = false;
while (!done) {
diff --git a/src/core/SkGlyphRunPainter.cpp b/src/core/SkGlyphRunPainter.cpp
index 0357e32..b66341c 100644
--- a/src/core/SkGlyphRunPainter.cpp
+++ b/src/core/SkGlyphRunPainter.cpp
@@ -282,7 +282,7 @@
#if SK_SUPPORT_GPU
// -- GrTextContext --------------------------------------------------------------------------------
-GrColor4h generate_filtered_color(const SkPaint& paint, const GrColorSpaceInfo& colorSpaceInfo) {
+SkPMColor4f generate_filtered_color(const SkPaint& paint, const GrColorSpaceInfo& colorSpaceInfo) {
SkColor4f filteredColor = paint.getColor4f();
if (auto* xform = colorSpaceInfo.colorSpaceXformFromSRGB()) {
filteredColor = xform->apply(filteredColor);
@@ -291,7 +291,7 @@
filteredColor = paint.getColorFilter()->filterColor4f(filteredColor,
colorSpaceInfo.colorSpace());
}
- return GrColor4h::FromFloats(filteredColor.premul().vec());
+ return filteredColor.premul();
}
void GrTextContext::drawGlyphRunList(
@@ -302,7 +302,7 @@
// Get the first paint to use as the key paint.
const SkPaint& listPaint = glyphRunList.paint();
- GrColor4h filteredColor = generate_filtered_color(listPaint, target->colorSpaceInfo());
+ SkPMColor4f filteredColor = generate_filtered_color(listPaint, target->colorSpaceInfo());
// If we have been abandoned, then don't draw
if (context->abandoned()) {
@@ -391,7 +391,7 @@
const sk_sp<GrTextStrike>& strike,
const SkGlyph& skGlyph, GrGlyph::MaskStyle maskStyle,
SkScalar sx, SkScalar sy,
- const GrColor4h& color, SkGlyphCache* skGlyphCache,
+ const SkPMColor4f& color, SkGlyphCache* skGlyphCache,
SkScalar textRatio, bool needsTransform) {
GrGlyph::PackedID id = GrGlyph::Pack(skGlyph.getGlyphID(),
skGlyph.getSubXFixed(),
@@ -419,7 +419,7 @@
GrGlyphCache* glyphCache,
const GrShaderCaps& shaderCaps,
const SkPaint& paint,
- const GrColor4h& filteredColor,
+ const SkPMColor4f& filteredColor,
SkScalerContextFlags scalerContextFlags,
const SkMatrix& viewMatrix,
const SkSurfaceProps& props,
@@ -453,7 +453,7 @@
const SkSurfaceProps& fProps;
const SkScalerContextFlags fScalerContextFlags;
GrGlyphCache* const fGlyphCache;
- GrColor4h fFilteredColor;
+ SkPMColor4f fFilteredColor;
};
SkPoint origin = glyphRunList.origin();
@@ -615,7 +615,7 @@
size_t textLen = (int)strlen(text);
- GrColor4h filteredColor = generate_filtered_color(skPaint, rtc->colorSpaceInfo());
+ SkPMColor4f filteredColor = generate_filtered_color(skPaint, rtc->colorSpaceInfo());
auto origin = SkPoint::Make(x, y);
SkGlyphRunBuilder builder;
diff --git a/src/core/SkPM4f.h b/src/core/SkPM4f.h
index 07d6733..bb9a056 100644
--- a/src/core/SkPM4f.h
+++ b/src/core/SkPM4f.h
@@ -48,5 +48,9 @@
constexpr SkPMColor4f SK_PMColor4fTRANSPARENT = { 0, 0, 0, 0 };
constexpr SkPMColor4f SK_PMColor4fWHITE = { 1, 1, 1, 1 };
+constexpr SkPMColor4f SK_PMColor4fILLEGAL = { SK_FloatNegativeInfinity,
+ SK_FloatNegativeInfinity,
+ SK_FloatNegativeInfinity,
+ SK_FloatNegativeInfinity };
#endif
diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp
index 0ca6232..6057561 100644
--- a/src/gpu/GrDefaultGeoProcFactory.cpp
+++ b/src/gpu/GrDefaultGeoProcFactory.cpp
@@ -39,7 +39,7 @@
public:
static sk_sp<GrGeometryProcessor> Make(const GrShaderCaps* shaderCaps,
uint32_t gpTypeFlags,
- const GrColor4h& color,
+ const SkPMColor4f& color,
sk_sp<GrColorSpaceXform> colorSpaceXform,
const SkMatrix& viewMatrix,
const SkMatrix& localMatrix,
@@ -54,7 +54,7 @@
const char* name() const override { return "DefaultGeometryProcessor"; }
- const GrColor4h& color() const { return fColor; }
+ const SkPMColor4f& color() const { return fColor; }
bool hasVertexColor() const { return fInColor.isInitialized(); }
const SkMatrix& viewMatrix() const { return fViewMatrix; }
const SkMatrix& localMatrix() const { return fLocalMatrix; }
@@ -68,7 +68,9 @@
class GLSLProcessor : public GrGLSLGeometryProcessor {
public:
GLSLProcessor()
- : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor4h_ILLEGAL), fCoverage(0xff) {}
+ : fViewMatrix(SkMatrix::InvalidMatrix())
+ , fColor(SK_PMColor4fILLEGAL)
+ , fCoverage(0xff) {}
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
const DefaultGeoProc& gp = args.fGP.cast<DefaultGeoProc>();
@@ -230,9 +232,7 @@
}
if (!dgp.hasVertexColor() && dgp.color() != fColor) {
- float c[4];
- dgp.color().toFloats(c);
- pdman.set4fv(fColorUniform, 1, c);
+ pdman.set4fv(fColorUniform, 1, dgp.color().vec());
fColor = dgp.color();
}
@@ -281,7 +281,7 @@
private:
SkMatrix fViewMatrix;
- GrColor4h fColor;
+ SkPMColor4f fColor;
uint8_t fCoverage;
UniformHandle fViewMatrixUniform;
UniformHandle fColorUniform;
@@ -303,7 +303,7 @@
private:
DefaultGeoProc(const GrShaderCaps* shaderCaps,
uint32_t gpTypeFlags,
- const GrColor4h& color,
+ const SkPMColor4f& color,
sk_sp<GrColorSpaceXform> colorSpaceXform,
const SkMatrix& viewMatrix,
const SkMatrix& localMatrix,
@@ -370,7 +370,7 @@
Attribute fInCoverage;
Attribute fInBoneIndices;
Attribute fInBoneWeights;
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkMatrix fViewMatrix;
SkMatrix fLocalMatrix;
uint8_t fCoverage;
@@ -417,7 +417,7 @@
return DefaultGeoProc::Make(d->caps()->shaderCaps(),
flags,
- GrColor4h::FromGrColor(GrRandomColor(d->fRandom)),
+ SkPMColor4f::FromBytes_RGBA(GrRandomColor(d->fRandom)),
GrTest::TestColorXform(d->fRandom),
GrTest::TestMatrix(d->fRandom),
GrTest::TestMatrix(d->fRandom),
@@ -445,10 +445,9 @@
uint8_t inCoverage = coverage.fCoverage;
bool localCoordsWillBeRead = localCoords.fType != LocalCoords::kUnused_Type;
- GrColor4h inColor = color.fColor;
return DefaultGeoProc::Make(shaderCaps,
flags,
- inColor,
+ color.fColor,
color.fColorSpaceXform,
viewMatrix,
localCoords.fMatrix ? *localCoords.fMatrix : SkMatrix::I(),
@@ -499,10 +498,9 @@
uint8_t inCoverage = coverage.fCoverage;
bool localCoordsWillBeRead = localCoords.fType != LocalCoords::kUnused_Type;
- GrColor4h inColor = color.fColor;
return DefaultGeoProc::Make(shaderCaps,
flags,
- inColor,
+ color.fColor,
color.fColorSpaceXform,
viewMatrix,
localCoords.fMatrix ? *localCoords.fMatrix : SkMatrix::I(),
diff --git a/src/gpu/GrDefaultGeoProcFactory.h b/src/gpu/GrDefaultGeoProcFactory.h
index c00f8d1..007aea2 100644
--- a/src/gpu/GrDefaultGeoProcFactory.h
+++ b/src/gpu/GrDefaultGeoProcFactory.h
@@ -70,19 +70,19 @@
kPremulGrColorAttribute_Type,
kUnpremulSkColorAttribute_Type,
};
- explicit Color(const GrColor4h& color)
+ explicit Color(const SkPMColor4f& color)
: fType(kPremulGrColorUniform_Type)
, fColor(color)
, fColorSpaceXform(nullptr) {}
Color(Type type)
: fType(type)
- , fColor(GrColor4h_ILLEGAL)
+ , fColor(SK_PMColor4fILLEGAL)
, fColorSpaceXform(nullptr) {
SkASSERT(type != kPremulGrColorUniform_Type);
}
Type fType;
- GrColor4h fColor;
+ SkPMColor4f fColor;
// This only applies to SkColor. Any GrColors are assumed to have been color converted
// during paint conversion.
diff --git a/src/gpu/GrPathProcessor.cpp b/src/gpu/GrPathProcessor.cpp
index 1c1c722..4be92d8 100644
--- a/src/gpu/GrPathProcessor.cpp
+++ b/src/gpu/GrPathProcessor.cpp
@@ -18,7 +18,7 @@
class GrGLPathProcessor : public GrGLSLPrimitiveProcessor {
public:
- GrGLPathProcessor() : fColor(GrColor4h_ILLEGAL) {}
+ GrGLPathProcessor() : fColor(SK_PMColor4fILLEGAL) {}
static void GenKey(const GrPathProcessor& pathProc,
const GrShaderCaps&,
@@ -76,9 +76,7 @@
FPCoordTransformIter&& transformIter) override {
const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>();
if (pathProc.color() != fColor) {
- float c[4];
- pathProc.color().toFloats(c);
- pd.set4fv(fColorUniform, 1, c);
+ pd.set4fv(fColorUniform, 1, pathProc.color().vec());
fColor = pathProc.color();
}
@@ -110,12 +108,12 @@
SkTArray<TransformVarying, true> fInstalledTransforms;
UniformHandle fColorUniform;
- GrColor4h fColor;
+ SkPMColor4f fColor;
typedef GrGLSLPrimitiveProcessor INHERITED;
};
-GrPathProcessor::GrPathProcessor(const GrColor4h& color,
+GrPathProcessor::GrPathProcessor(const SkPMColor4f& color,
const SkMatrix& viewMatrix,
const SkMatrix& localMatrix)
: INHERITED(kGrPathProcessor_ClassID)
diff --git a/src/gpu/GrPathProcessor.h b/src/gpu/GrPathProcessor.h
index fd396d6..9bcddc5 100644
--- a/src/gpu/GrPathProcessor.h
+++ b/src/gpu/GrPathProcessor.h
@@ -16,7 +16,7 @@
*/
class GrPathProcessor : public GrPrimitiveProcessor {
public:
- static GrPathProcessor* Create(const GrColor4h& color,
+ static GrPathProcessor* Create(const SkPMColor4f& color,
const SkMatrix& viewMatrix = SkMatrix::I(),
const SkMatrix& localMatrix = SkMatrix::I()) {
return new GrPathProcessor(color, viewMatrix, localMatrix);
@@ -24,7 +24,7 @@
const char* name() const override { return "PathProcessor"; }
- const GrColor4h& color() const { return fColor; }
+ const SkPMColor4f& color() const { return fColor; }
const SkMatrix& viewMatrix() const { return fViewMatrix; }
const SkMatrix& localMatrix() const { return fLocalMatrix; }
@@ -50,9 +50,9 @@
return kBogus;
}
- GrPathProcessor(const GrColor4h&, const SkMatrix& viewMatrix, const SkMatrix& localMatrix);
+ GrPathProcessor(const SkPMColor4f&, const SkMatrix& viewMatrix, const SkMatrix& localMatrix);
- GrColor4h fColor;
+ SkPMColor4f fColor;
const SkMatrix fViewMatrix;
const SkMatrix fLocalMatrix;
diff --git a/src/gpu/GrProcessor.h b/src/gpu/GrProcessor.h
index b35f280..48eba1e 100644
--- a/src/gpu/GrProcessor.h
+++ b/src/gpu/GrProcessor.h
@@ -17,6 +17,7 @@
#include "GrSurfaceProxyPriv.h"
#include "GrTextureProxy.h"
#include "SkMath.h"
+#include "SkPM4f.h"
#include "SkString.h"
class GrContext;
diff --git a/src/gpu/GrProcessorAnalysis.cpp b/src/gpu/GrProcessorAnalysis.cpp
index 8162131..a22506f 100644
--- a/src/gpu/GrProcessorAnalysis.cpp
+++ b/src/gpu/GrProcessorAnalysis.cpp
@@ -17,10 +17,7 @@
fIsOpaque = input.isOpaque();
fUsesLocalCoords = false;
fProcessorsToEliminate = 0;
- GrColor4h color;
- if ((fKnowOutputColor = input.isConstant(&color))) {
- color.toFloats(fLastKnownOutputColor.vec());
- }
+ fKnowOutputColor = input.isConstant(&fLastKnownOutputColor);
for (int i = 0; i < cnt; ++i) {
if (fUsesLocalCoords && !fKnowOutputColor && !fCompatibleWithCoverageAsAlpha &&
!fIsOpaque) {
diff --git a/src/gpu/GrProcessorAnalysis.h b/src/gpu/GrProcessorAnalysis.h
index 6c09ea1..abe8bfa 100644
--- a/src/gpu/GrProcessorAnalysis.h
+++ b/src/gpu/GrProcessorAnalysis.h
@@ -24,11 +24,11 @@
constexpr GrProcessorAnalysisColor(Opaque opaque = Opaque::kNo)
: fFlags(opaque == Opaque::kYes ? kIsOpaque_Flag : 0)
- , fColor(GrColor4h_TRANSPARENT) {}
+ , fColor(SK_PMColor4fTRANSPARENT) {}
- GrProcessorAnalysisColor(const GrColor4h& color) { this->setToConstant(color); }
+ GrProcessorAnalysisColor(const SkPMColor4f& color) { this->setToConstant(color); }
- void setToConstant(const GrColor4h& color) {
+ void setToConstant(const SkPMColor4f& color) {
fColor = color;
if (color.isOpaque()) {
fFlags = kColorIsKnown_Flag | kIsOpaque_Flag;
@@ -46,14 +46,14 @@
bool isConstant(GrColor* color) const {
if (kColorIsKnown_Flag & fFlags) {
if (color) {
- *color = fColor.toGrColor();
+ *color = fColor.toBytes_RGBA();
}
return true;
}
return false;
}
- bool isConstant(GrColor4h* color = nullptr) const {
+ bool isConstant(SkPMColor4f* color = nullptr) const {
if (kColorIsKnown_Flag & fFlags) {
if (color) {
*color = fColor;
@@ -90,7 +90,7 @@
kIsOpaque_Flag = 0x2,
};
uint32_t fFlags;
- GrColor4h fColor;
+ SkPMColor4f fColor;
};
enum class GrProcessorAnalysisCoverage { kNone, kSingleChannel, kLCD };
@@ -140,19 +140,12 @@
return fProcessorsToEliminate;
}
- int initialProcessorsToEliminate(GrColor4h* newPipelineInputColor) const {
- if (fProcessorsToEliminate > 0) {
- *newPipelineInputColor = GrColor4h::FromFloats(fLastKnownOutputColor.vec());
- }
- return fProcessorsToEliminate;
- }
-
/**
* Provides known information about the last processor's output color.
*/
GrProcessorAnalysisColor outputColor() const {
if (fKnowOutputColor) {
- return GrColor4h::FromFloats(fLastKnownOutputColor.vec());
+ return fLastKnownOutputColor;
}
return fIsOpaque ? GrProcessorAnalysisColor::Opaque::kYes
: GrProcessorAnalysisColor::Opaque::kNo;
diff --git a/src/gpu/GrProcessorSet.cpp b/src/gpu/GrProcessorSet.cpp
index 176e2c3..060bca4 100644
--- a/src/gpu/GrProcessorSet.cpp
+++ b/src/gpu/GrProcessorSet.cpp
@@ -160,7 +160,7 @@
const GrProcessorAnalysisCoverage coverageInput,
const GrAppliedClip* clip, bool isMixedSamples,
const GrCaps& caps,
- GrColor4h* overrideInputColor) {
+ SkPMColor4f* overrideInputColor) {
SkASSERT(!this->isFinalized());
SkASSERT(!fFragmentProcessorOffset);
diff --git a/src/gpu/GrProcessorSet.h b/src/gpu/GrProcessorSet.h
index dc1010e..d5c70cf 100644
--- a/src/gpu/GrProcessorSet.h
+++ b/src/gpu/GrProcessorSet.h
@@ -141,7 +141,7 @@
*/
Analysis finalize(const GrProcessorAnalysisColor& colorInput,
const GrProcessorAnalysisCoverage coverageInput, const GrAppliedClip*,
- bool isMixedSamples, const GrCaps&, GrColor4h* inputColorOverride);
+ bool isMixedSamples, const GrCaps&, SkPMColor4f* inputColorOverride);
bool isFinalized() const { return SkToBool(kFinalized_Flag & fFlags); }
diff --git a/src/gpu/ccpr/GrCCDrawPathsOp.cpp b/src/gpu/ccpr/GrCCDrawPathsOp.cpp
index 0fc321d..0f3aef5 100644
--- a/src/gpu/ccpr/GrCCDrawPathsOp.cpp
+++ b/src/gpu/ccpr/GrCCDrawPathsOp.cpp
@@ -120,7 +120,7 @@
: GrDrawOp(ClassID())
, fViewMatrixIfUsingLocalCoords(has_coord_transforms(paint) ? m : SkMatrix::I())
, fDraws(m, shape, strokeDevWidth, shapeConservativeIBounds, maskDevIBounds, maskVisibility,
- GrColor4h::FromFloats(paint.getColor4f().vec()))
+ paint.getColor4f())
, fProcessors(std::move(paint)) { // Paint must be moved after fetching its color above.
SkDEBUGCODE(fBaseInstance = -1);
// FIXME: intersect with clip bounds to (hopefully) improve batching.
@@ -139,7 +139,7 @@
float strokeDevWidth,
const SkIRect& shapeConservativeIBounds,
const SkIRect& maskDevIBounds, Visibility maskVisibility,
- const GrColor4h& color)
+ const SkPMColor4f& color)
: fMatrix(m)
, fShape(shape)
, fStrokeDevWidth(strokeDevWidth)
@@ -199,8 +199,8 @@
// TODO4F: Preserve float colors
// fShapeConservativeIBounds already accounted for this possibility of inflating the stroke.
- draw->fColor = GrColor4h::FromGrColor(
- GrColorMul(draw->fColor.toGrColor(), coverageAsAlpha));
+ draw->fColor = SkPMColor4f::FromBytes_RGBA(
+ GrColorMul(draw->fColor.toBytes_RGBA(), coverageAsAlpha));
}
return RequiresDstTexture(analysis.requiresDstTexture());
@@ -327,7 +327,7 @@
this->recordInstance(proxy, resources->nextPathInstanceIdx());
// TODO4F: Preserve float colors
resources->appendDrawPathInstance().set(*cacheEntry, draw.fCachedMaskShift,
- draw.fColor.toGrColor());
+ draw.fColor.toBytes_RGBA());
continue;
}
@@ -337,7 +337,7 @@
this->recordInstance(atlas->textureProxy(), resources->nextPathInstanceIdx());
// TODO4F: Preserve float colors
resources->appendDrawPathInstance().set(
- *cacheEntry, draw.fCachedMaskShift, draw.fColor.toGrColor(),
+ *cacheEntry, draw.fCachedMaskShift, draw.fColor.toBytes_RGBA(),
cacheEntry->hasCachedAtlas() ? DoEvenOddFill::kNo : doEvenOddFill);
continue;
}
@@ -355,7 +355,7 @@
this->recordInstance(atlas->textureProxy(), resources->nextPathInstanceIdx());
// TODO4F: Preserve float colors
resources->appendDrawPathInstance().set(*cacheEntry, draw.fCachedMaskShift,
- draw.fColor.toGrColor());
+ draw.fColor.toBytes_RGBA());
// Remember this atlas in case we encounter the path again during the same flush.
cacheEntry->setCurrFlushAtlas(atlas);
continue;
@@ -376,7 +376,7 @@
this->recordInstance(atlas->textureProxy(), resources->nextPathInstanceIdx());
// TODO4F: Preserve float colors
resources->appendDrawPathInstance().set(devBounds, devBounds45, devToAtlasOffset,
- draw.fColor.toGrColor(), doEvenOddFill);
+ draw.fColor.toBytes_RGBA(), doEvenOddFill);
// If we have a spot in the path cache, try to make a note of where this mask is so we
// can reuse it in the future.
diff --git a/src/gpu/ccpr/GrCCDrawPathsOp.h b/src/gpu/ccpr/GrCCDrawPathsOp.h
index 8d52297..33271c5 100644
--- a/src/gpu/ccpr/GrCCDrawPathsOp.h
+++ b/src/gpu/ccpr/GrCCDrawPathsOp.h
@@ -93,7 +93,7 @@
struct SingleDraw {
SingleDraw(const SkMatrix&, const GrShape&, float strokeDevWidth,
const SkIRect& shapeConservativeIBounds, const SkIRect& maskDevIBounds,
- Visibility maskVisibility, const GrColor4h&);
+ Visibility maskVisibility, const SkPMColor4f&);
~SingleDraw();
SkMatrix fMatrix;
@@ -102,7 +102,7 @@
const SkIRect fShapeConservativeIBounds;
SkIRect fMaskDevIBounds;
Visibility fMaskVisibility;
- GrColor4h fColor;
+ SkPMColor4f fColor;
sk_sp<GrCCPathCacheEntry> fCacheEntry;
sk_sp<GrTextureProxy> fCachedAtlasProxy;
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp
index 6f5395e..0f59eda 100644
--- a/src/gpu/effects/GrBezierEffect.cpp
+++ b/src/gpu/effects/GrBezierEffect.cpp
@@ -37,9 +37,7 @@
}
if (ce.color() != fColor) {
- float c[4];
- ce.color().toFloats(c);
- pdman.set4fv(fColorUniform, 1, c);
+ pdman.set4fv(fColorUniform, 1, ce.color().vec());
fColor = ce.color();
}
@@ -52,7 +50,7 @@
private:
SkMatrix fViewMatrix;
- GrColor4h fColor;
+ SkPMColor4f fColor;
uint8_t fCoverageScale;
GrClipEdgeType fEdgeType;
UniformHandle fColorUniform;
@@ -63,7 +61,7 @@
};
GrGLConicEffect::GrGLConicEffect(const GrGeometryProcessor& processor)
- : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor4h_ILLEGAL), fCoverageScale(0xff) {
+ : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(SK_PMColor4fILLEGAL), fCoverageScale(0xff) {
const GrConicEffect& ce = processor.cast<GrConicEffect>();
fEdgeType = ce.getEdgeType();
}
@@ -232,7 +230,7 @@
return new GrGLConicEffect(*this);
}
-GrConicEffect::GrConicEffect(const GrColor4h& color, const SkMatrix& viewMatrix, uint8_t coverage,
+GrConicEffect::GrConicEffect(const SkPMColor4f& color, const SkMatrix& viewMatrix, uint8_t coverage,
GrClipEdgeType edgeType, const SkMatrix& localMatrix,
bool usesLocalCoords)
: INHERITED(kGrConicEffect_ClassID)
@@ -256,7 +254,7 @@
GrClipEdgeType edgeType =
static_cast<GrClipEdgeType>(
d->fRandom->nextULessThan(kGrClipEdgeTypeCnt));
- gp = GrConicEffect::Make(GrColor4h::FromGrColor(GrRandomColor(d->fRandom)),
+ gp = GrConicEffect::Make(SkPMColor4f::FromBytes_RGBA(GrRandomColor(d->fRandom)),
GrTest::TestMatrix(d->fRandom), edgeType, *d->caps(),
GrTest::TestMatrix(d->fRandom), d->fRandom->nextBool());
} while (nullptr == gp);
@@ -290,9 +288,7 @@
}
if (qe.color() != fColor) {
- float c[4];
- qe.color().toFloats(c);
- pdman.set4fv(fColorUniform, 1, c);
+ pdman.set4fv(fColorUniform, 1, qe.color().vec());
fColor = qe.color();
}
@@ -305,7 +301,7 @@
private:
SkMatrix fViewMatrix;
- GrColor4h fColor;
+ SkPMColor4f fColor;
uint8_t fCoverageScale;
GrClipEdgeType fEdgeType;
UniformHandle fColorUniform;
@@ -316,7 +312,7 @@
};
GrGLQuadEffect::GrGLQuadEffect(const GrGeometryProcessor& processor)
- : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor4h_ILLEGAL), fCoverageScale(0xff) {
+ : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(SK_PMColor4fILLEGAL), fCoverageScale(0xff) {
const GrQuadEffect& ce = processor.cast<GrQuadEffect>();
fEdgeType = ce.getEdgeType();
}
@@ -434,7 +430,7 @@
return new GrGLQuadEffect(*this);
}
-GrQuadEffect::GrQuadEffect(const GrColor4h& color, const SkMatrix& viewMatrix, uint8_t coverage,
+GrQuadEffect::GrQuadEffect(const SkPMColor4f& color, const SkMatrix& viewMatrix, uint8_t coverage,
GrClipEdgeType edgeType, const SkMatrix& localMatrix,
bool usesLocalCoords)
: INHERITED(kGrQuadEffect_ClassID)
@@ -457,7 +453,7 @@
do {
GrClipEdgeType edgeType = static_cast<GrClipEdgeType>(
d->fRandom->nextULessThan(kGrClipEdgeTypeCnt));
- gp = GrQuadEffect::Make(GrColor4h::FromGrColor(GrRandomColor(d->fRandom)),
+ gp = GrQuadEffect::Make(SkPMColor4f::FromBytes_RGBA(GrRandomColor(d->fRandom)),
GrTest::TestMatrix(d->fRandom), edgeType, *d->caps(),
GrTest::TestMatrix(d->fRandom), d->fRandom->nextBool());
} while (nullptr == gp);
@@ -498,9 +494,7 @@
}
if (ce.color() != fColor) {
- float c[4];
- ce.color().toFloats(c);
- pdman.set4fv(fColorUniform, 1, c);
+ pdman.set4fv(fColorUniform, 1, ce.color().vec());
fColor = ce.color();
}
@@ -510,7 +504,7 @@
private:
SkMatrix fViewMatrix;
SkMatrix fDevKLMMatrix;
- GrColor4h fColor;
+ SkPMColor4f fColor;
GrClipEdgeType fEdgeType;
UniformHandle fColorUniform;
UniformHandle fViewMatrixUniform;
@@ -522,7 +516,7 @@
GrGLCubicEffect::GrGLCubicEffect(const GrGeometryProcessor& processor)
: fViewMatrix(SkMatrix::InvalidMatrix())
, fDevKLMMatrix(SkMatrix::InvalidMatrix())
- , fColor(GrColor4h_ILLEGAL) {
+ , fColor(SK_PMColor4fILLEGAL) {
const GrCubicEffect& ce = processor.cast<GrCubicEffect>();
fEdgeType = ce.getEdgeType();
}
@@ -661,7 +655,7 @@
return new GrGLCubicEffect(*this);
}
-GrCubicEffect::GrCubicEffect(const GrColor4h& color, const SkMatrix& viewMatrix, const SkMatrix&
+GrCubicEffect::GrCubicEffect(const SkPMColor4f& color, const SkMatrix& viewMatrix, const SkMatrix&
devKLMMatrix, GrClipEdgeType edgeType)
: INHERITED(kGrCubicEffect_ClassID)
, fColor(color)
@@ -682,7 +676,7 @@
GrClipEdgeType edgeType =
static_cast<GrClipEdgeType>(
d->fRandom->nextULessThan(kGrClipEdgeTypeCnt));
- gp = GrCubicEffect::Make(GrColor4h::FromGrColor(GrRandomColor(d->fRandom)),
+ gp = GrCubicEffect::Make(SkPMColor4f::FromBytes_RGBA(GrRandomColor(d->fRandom)),
GrTest::TestMatrix(d->fRandom), GrTest::TestMatrix(d->fRandom),
d->fRandom->nextBool(), edgeType, *d->caps());
} while (nullptr == gp);
diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h
index 71ee5c9..b168fdd 100644
--- a/src/gpu/effects/GrBezierEffect.h
+++ b/src/gpu/effects/GrBezierEffect.h
@@ -57,7 +57,7 @@
class GrConicEffect : public GrGeometryProcessor {
public:
- static sk_sp<GrGeometryProcessor> Make(const GrColor4h& color,
+ static sk_sp<GrGeometryProcessor> Make(const SkPMColor4f& color,
const SkMatrix& viewMatrix,
const GrClipEdgeType edgeType,
const GrCaps& caps,
@@ -98,7 +98,7 @@
inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
inline GrClipEdgeType getEdgeType() const { return fEdgeType; }
- const GrColor4h& color() const { return fColor; }
+ const SkPMColor4f& color() const { return fColor; }
const SkMatrix& viewMatrix() const { return fViewMatrix; }
const SkMatrix& localMatrix() const { return fLocalMatrix; }
bool usesLocalCoords() const { return fUsesLocalCoords; }
@@ -109,12 +109,12 @@
GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const override;
private:
- GrConicEffect(const GrColor4h&, const SkMatrix& viewMatrix, uint8_t coverage, GrClipEdgeType,
+ GrConicEffect(const SkPMColor4f&, const SkMatrix& viewMatrix, uint8_t coverage, GrClipEdgeType,
const SkMatrix& localMatrix, bool usesLocalCoords);
const Attribute& onVertexAttribute(int i) const override { return kAttributes[i]; }
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkMatrix fViewMatrix;
SkMatrix fLocalMatrix;
bool fUsesLocalCoords;
@@ -143,7 +143,7 @@
class GrQuadEffect : public GrGeometryProcessor {
public:
- static sk_sp<GrGeometryProcessor> Make(const GrColor4h& color,
+ static sk_sp<GrGeometryProcessor> Make(const SkPMColor4f& color,
const SkMatrix& viewMatrix,
const GrClipEdgeType edgeType,
const GrCaps& caps,
@@ -184,7 +184,7 @@
inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
inline GrClipEdgeType getEdgeType() const { return fEdgeType; }
- const GrColor4h& color() const { return fColor; }
+ const SkPMColor4f& color() const { return fColor; }
const SkMatrix& viewMatrix() const { return fViewMatrix; }
const SkMatrix& localMatrix() const { return fLocalMatrix; }
bool usesLocalCoords() const { return fUsesLocalCoords; }
@@ -195,12 +195,12 @@
GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const override;
private:
- GrQuadEffect(const GrColor4h&, const SkMatrix& viewMatrix, uint8_t coverage, GrClipEdgeType,
+ GrQuadEffect(const SkPMColor4f&, const SkMatrix& viewMatrix, uint8_t coverage, GrClipEdgeType,
const SkMatrix& localMatrix, bool usesLocalCoords);
const Attribute& onVertexAttribute(int i) const override { return kAttributes[i]; }
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkMatrix fViewMatrix;
SkMatrix fLocalMatrix;
bool fUsesLocalCoords;
@@ -232,7 +232,7 @@
class GrCubicEffect : public GrGeometryProcessor {
public:
- static sk_sp<GrGeometryProcessor> Make(const GrColor4h& color,
+ static sk_sp<GrGeometryProcessor> Make(const SkPMColor4f& color,
const SkMatrix& viewMatrix,
const SkMatrix& klm,
bool flipKL,
@@ -276,8 +276,8 @@
inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
inline GrClipEdgeType getEdgeType() const { return fEdgeType; }
- const GrColor4h& color() const { return fColor; }
- bool colorIgnored() const { return GrColor4h_ILLEGAL == fColor; }
+ const SkPMColor4f& color() const { return fColor; }
+ bool colorIgnored() const { return SK_PMColor4fILLEGAL == fColor; }
const SkMatrix& viewMatrix() const { return fViewMatrix; }
const SkMatrix& devKLMMatrix() const { return fDevKLMMatrix; }
@@ -286,12 +286,12 @@
GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const override;
private:
- GrCubicEffect(const GrColor4h&, const SkMatrix& viewMatrix, const SkMatrix& devKLMMatrix,
+ GrCubicEffect(const SkPMColor4f&, const SkMatrix& viewMatrix, const SkMatrix& devKLMMatrix,
GrClipEdgeType);
const Attribute& onVertexAttribute(int) const override { return kInPosition; }
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkMatrix fViewMatrix;
SkMatrix fDevKLMMatrix;
GrClipEdgeType fEdgeType;
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index e629434..15df560 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -20,7 +20,7 @@
class GrGLBitmapTextGeoProc : public GrGLSLGeometryProcessor {
public:
- GrGLBitmapTextGeoProc() : fColor(GrColor4h_ILLEGAL), fAtlasSize({0,0}) {}
+ GrGLBitmapTextGeoProc() : fColor(SK_PMColor4fILLEGAL), fAtlasSize({0,0}) {}
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
const GrBitmapTextGeoProc& btgp = args.fGP.cast<GrBitmapTextGeoProc>();
@@ -82,9 +82,7 @@
FPCoordTransformIter&& transformIter) override {
const GrBitmapTextGeoProc& btgp = gp.cast<GrBitmapTextGeoProc>();
if (btgp.color() != fColor && !btgp.hasVertexColor()) {
- float c[4];
- btgp.color().toFloats(c);
- pdman.set4fv(fColorUniform, 1, c);
+ pdman.set4fv(fColorUniform, 1, btgp.color().vec());
fColor = btgp.color();
}
@@ -110,7 +108,7 @@
}
private:
- GrColor4h fColor;
+ SkPMColor4f fColor;
UniformHandle fColorUniform;
SkISize fAtlasSize;
@@ -122,7 +120,7 @@
///////////////////////////////////////////////////////////////////////////////
GrBitmapTextGeoProc::GrBitmapTextGeoProc(const GrShaderCaps& caps,
- const GrColor4h& color,
+ const SkPMColor4f& color,
const sk_sp<GrTextureProxy>* proxies,
int numActiveProxies,
const GrSamplerState& params, GrMaskFormat format,
@@ -233,7 +231,7 @@
}
return GrBitmapTextGeoProc::Make(*d->caps()->shaderCaps(),
- GrColor4h::FromGrColor(GrRandomColor(d->fRandom)),
+ SkPMColor4f::FromBytes_RGBA(GrRandomColor(d->fRandom)),
proxies, 1, samplerState, format,
GrTest::TestMatrix(d->fRandom), d->fRandom->nextBool());
}
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h
index 42fd203..55e5925 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.h
+++ b/src/gpu/effects/GrBitmapTextGeoProc.h
@@ -23,7 +23,7 @@
public:
static constexpr int kMaxTextures = 4;
- static sk_sp<GrGeometryProcessor> Make(const GrShaderCaps& caps, const GrColor4h& color,
+ static sk_sp<GrGeometryProcessor> Make(const GrShaderCaps& caps, const SkPMColor4f& color,
const sk_sp<GrTextureProxy>* proxies,
int numActiveProxies,
const GrSamplerState& p, GrMaskFormat format,
@@ -41,7 +41,7 @@
const Attribute& inColor() const { return fInColor; }
const Attribute& inTextureCoords() const { return fInTextureCoords; }
GrMaskFormat maskFormat() const { return fMaskFormat; }
- const GrColor4h& color() const { return fColor; }
+ const SkPMColor4f& color() const { return fColor; }
bool hasVertexColor() const { return fInColor.isInitialized(); }
const SkMatrix& localMatrix() const { return fLocalMatrix; }
bool usesW() const { return fUsesW; }
@@ -54,14 +54,15 @@
GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps& caps) const override;
private:
- GrBitmapTextGeoProc(const GrShaderCaps&, const GrColor4h&, const sk_sp<GrTextureProxy>* proxies,
- int numProxies, const GrSamplerState& params, GrMaskFormat format,
+ GrBitmapTextGeoProc(const GrShaderCaps&, const SkPMColor4f&,
+ const sk_sp<GrTextureProxy>* proxies, int numProxies,
+ const GrSamplerState& params, GrMaskFormat format,
const SkMatrix& localMatrix, bool usesW);
const Attribute& onVertexAttribute(int i) const override;
const TextureSampler& onTextureSampler(int i) const override { return fTextureSamplers[i]; }
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkMatrix fLocalMatrix;
bool fUsesW;
SkISize fAtlasSize; // size for all textures used with fTextureSamplers[].
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index 0f8fb4e..8c74f27 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -765,7 +765,7 @@
stencilSettings);
}
- AAConvexPathOp(const Helper::MakeArgs& helperArgs, const GrColor4h& color,
+ AAConvexPathOp(const Helper::MakeArgs& helperArgs, const SkPMColor4f& color,
const SkMatrix& viewMatrix, const SkPath& path,
const GrUserStencilSettings* stencilSettings)
: INHERITED(ClassID()), fHelper(helperArgs, GrAAType::kCoverage, stencilSettings) {
@@ -845,7 +845,7 @@
}
// TODO4F: Preserve float colors
- extract_lines_only_verts(tess, verts, vertexStride, args.fColor.toGrColor(), idxs,
+ extract_lines_only_verts(tess, verts, vertexStride, args.fColor.toBytes_RGBA(), idxs,
fHelper.compatibleWithAlphaAsCoverage());
GrMesh* mesh = target->allocMesh(GrPrimitiveType::kTriangles);
@@ -932,7 +932,7 @@
SkSTArray<kPreallocDrawCnt, Draw, true> draws;
// TODO4F: Preserve float colors
- create_vertices(segments, fanPt, args.fColor.toGrColor(), &draws, verts, idxs);
+ create_vertices(segments, fanPt, args.fColor.toBytes_RGBA(), &draws, verts, idxs);
GrMesh* meshes = target->allocMeshes(draws.count());
for (int j = 0; j < draws.count(); ++j) {
@@ -970,7 +970,7 @@
struct PathData {
SkMatrix fViewMatrix;
SkPath fPath;
- GrColor4h fColor;
+ SkPMColor4f fColor;
};
Helper fHelper;
diff --git a/src/gpu/ops/GrAAFillRectOp.cpp b/src/gpu/ops/GrAAFillRectOp.cpp
index 788c805..c899465 100644
--- a/src/gpu/ops/GrAAFillRectOp.cpp
+++ b/src/gpu/ops/GrAAFillRectOp.cpp
@@ -185,7 +185,7 @@
}
AAFillRectOp(const Helper::MakeArgs& helperArgs,
- const GrColor4h& color,
+ const SkPMColor4f& color,
const SkMatrix& viewMatrix,
const SkRect& rect,
const SkRect& devRect,
@@ -219,7 +219,7 @@
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().toGrColor(), rect.fLeft, rect.fTop, rect.fRight,
+ info->color().toBytes_RGBA(), rect.fLeft, rect.fTop, rect.fRight,
rect.fBottom);
info = this->next(info);
}
@@ -231,7 +231,7 @@
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor4h color = this->first()->color();
+ SkPMColor4f color = this->first()->color();
auto result = fHelper.xpRequiresDstTexture(
caps, clip, GrProcessorAnalysisCoverage::kSingleChannel, &color);
this->first()->setColor(color);
@@ -287,7 +287,7 @@
}
}
// TODO4F: Preserve float colors
- generate_aa_fill_rect_geometry(verts, vertexStride, info->color().toGrColor(),
+ generate_aa_fill_rect_geometry(verts, vertexStride, info->color().toBytes_RGBA(),
info->viewMatrix(), info->rect(), info->devRect(),
fHelper.compatibleWithAlphaAsCoverage(), localMatrix);
info = this->next(info);
@@ -309,21 +309,21 @@
struct RectInfo {
public:
- RectInfo(const GrColor4h& color, const SkMatrix& viewMatrix, const SkRect& rect,
+ RectInfo(const SkPMColor4f& color, const SkMatrix& viewMatrix, const SkRect& rect,
const SkRect& devRect)
: RectInfo(color, viewMatrix, rect, devRect, HasLocalMatrix::kNo) {}
bool hasLocalMatrix() const { return HasLocalMatrix::kYes == fHasLocalMatrix; }
- const GrColor4h& color() const { return fColor; }
+ const SkPMColor4f& color() const { return fColor; }
const SkMatrix& viewMatrix() const { return fViewMatrix; }
const SkRect& rect() const { return fRect; }
const SkRect& devRect() const { return fDevRect; }
- void setColor(const GrColor4h& color) { fColor = color; }
+ void setColor(const SkPMColor4f& color) { fColor = color; }
protected:
enum class HasLocalMatrix : uint32_t { kNo, kYes };
- RectInfo(const GrColor4h& color, const SkMatrix& viewMatrix, const SkRect& rect,
+ RectInfo(const SkPMColor4f& color, const SkMatrix& viewMatrix, const SkRect& rect,
const SkRect& devRect, HasLocalMatrix hasLM)
: fHasLocalMatrix(hasLM)
, fColor(color)
@@ -332,7 +332,7 @@
, fDevRect(devRect) {}
HasLocalMatrix fHasLocalMatrix;
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkMatrix fViewMatrix;
SkRect fRect;
SkRect fDevRect;
@@ -340,7 +340,7 @@
struct RectWithLocalMatrixInfo : public RectInfo {
public:
- RectWithLocalMatrixInfo(const GrColor4h& color, const SkMatrix& viewMatrix,
+ RectWithLocalMatrixInfo(const SkPMColor4f& color, const SkMatrix& viewMatrix,
const SkRect& rect, const SkRect& devRect,
const SkMatrix& localMatrix)
: RectInfo(color, viewMatrix, rect, devRect, HasLocalMatrix::kYes)
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
index 5f59ace..0c77462 100644
--- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@@ -803,7 +803,7 @@
}
AAHairlineOp(const Helper::MakeArgs& helperArgs,
- const GrColor4h& color,
+ const SkPMColor4f& color,
uint8_t coverage,
const SkMatrix& viewMatrix,
const SkPath& path,
@@ -828,7 +828,7 @@
SkString dumpInfo() const override {
SkString string;
- string.appendf("Color: 0x%08x Coverage: 0x%02x, Count: %d\n", fColor.toGrColor(),
+ string.appendf("Color: 0x%08x Coverage: 0x%02x, Count: %d\n", fColor.toBytes_RGBA(),
fCoverage, fPaths.count());
string += INHERITED::dumpInfo();
string += fHelper.dumpInfo();
@@ -885,7 +885,7 @@
return CombineResult::kMerged;
}
- const GrColor4h& color() const { return fColor; }
+ const SkPMColor4f& 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;
- GrColor4h fColor;
+ SkPMColor4f fColor;
uint8_t fCoverage;
typedef GrMeshDrawOp INHERITED;
diff --git a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
index e42cfbf..5bf6f7f 100644
--- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@@ -157,7 +157,7 @@
}
AAFlatteningConvexPathOp(const Helper::MakeArgs& helperArgs,
- const GrColor4h& color,
+ const SkPMColor4f& color,
const SkMatrix& viewMatrix,
const SkPath& path,
SkScalar strokeWidth,
@@ -195,7 +195,7 @@
string.appendf(
"Color: 0x%08x, StrokeWidth: %.2f, Style: %d, Join: %d, "
"MiterLimit: %.2f\n",
- path.fColor.toGrColor(), path.fStrokeWidth, path.fStyle, path.fJoin,
+ path.fColor.toBytes_RGBA(), path.fStrokeWidth, path.fStyle, path.fJoin,
path.fMiterLimit);
}
string += fHelper.dumpInfo();
@@ -307,7 +307,7 @@
// TODO4F: Preserve float colors
extract_verts(tess, vertices + vertexStride * vertexCount, vertexStride,
- args.fColor.toGrColor(), vertexCount, indices + indexCount,
+ args.fColor.toBytes_RGBA(), vertexCount, indices + indexCount,
fHelper.compatibleWithAlphaAsCoverage());
vertexCount += currentVertices;
indexCount += currentIndices;
@@ -333,7 +333,7 @@
const SkMatrix& viewMatrix() const { return fPaths[0].fViewMatrix; }
struct PathData {
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkMatrix fViewMatrix;
SkPath fPath;
SkScalar fStrokeWidth;
diff --git a/src/gpu/ops/GrAAStrokeRectOp.cpp b/src/gpu/ops/GrAAStrokeRectOp.cpp
index 458c705..b69eda7 100644
--- a/src/gpu/ops/GrAAStrokeRectOp.cpp
+++ b/src/gpu/ops/GrAAStrokeRectOp.cpp
@@ -133,7 +133,7 @@
devOutside, devInside);
}
- AAStrokeRectOp(const Helper::MakeArgs& helperArgs, const GrColor4h& color,
+ AAStrokeRectOp(const Helper::MakeArgs& helperArgs, const SkPMColor4f& 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, const GrColor4h& color,
+ AAStrokeRectOp(const Helper::MakeArgs& helperArgs, const SkPMColor4f& color,
const SkMatrix& viewMatrix, const SkRect& rect, const SkStrokeRec& stroke,
bool isMiter)
: INHERITED(ClassID())
@@ -194,7 +194,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.toGrColor(), info.fDevOutside.fLeft, info.fDevOutside.fTop,
+ info.fColor.toBytes_RGBA(), 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,
@@ -245,7 +245,7 @@
// TODO support AA rotated stroke rects by copying around view matrices
struct RectInfo {
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkRect fDevOutside;
SkRect fDevOutsideAssist;
SkRect fDevInside;
@@ -300,7 +300,7 @@
vertexStride,
outerVertexNum,
innerVertexNum,
- info.fColor.toGrColor(), // TODO4F
+ info.fColor.toBytes_RGBA(), // TODO4F
info.fDevOutside,
info.fDevOutsideAssist,
info.fDevInside,
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 7c3a834..5d0f81e 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.toGrColor(),
+ fGeoData[i].fColor.toBytes_RGBA(),
fGeoData[i].fX,
fGeoData[i].fY,
fGeoData[i].fBlob->runCount());
@@ -349,8 +349,8 @@
// TODO4F: Preserve float colors
GrTextBlob::VertexRegenerator regenerator(
resourceProvider, blob, args.fRun, args.fSubRun, args.fViewMatrix, args.fX, args.fY,
- args.fColor.toGrColor(), target->deferredUploadTarget(), glyphCache, atlasManager,
- &autoGlyphCache);
+ args.fColor.toBytes_RGBA(), target->deferredUploadTarget(), glyphCache,
+ atlasManager, &autoGlyphCache);
bool done = false;
while (!done) {
GrTextBlob::VertexRegenerator::Result result;
diff --git a/src/gpu/ops/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h
index 5bc86c7..9229d4c 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;
- GrColor4h fColor;
+ SkMatrix fViewMatrix;
+ SkIRect fClipRect;
+ Blob* fBlob;
+ SkScalar fX;
+ SkScalar fY;
+ uint16_t fRun;
+ uint16_t fSubRun;
+ SkPMColor4f fColor;
};
static std::unique_ptr<GrAtlasTextOp> MakeBitmap(GrContext* context,
@@ -145,7 +145,7 @@
inline void flush(GrMeshDrawOp::Target* target, FlushInfo* flushInfo) const;
- const GrColor4h& color() const { SkASSERT(fGeoCount > 0); return fGeoData[0].fColor; }
+ const SkPMColor4f& 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 aea967b..2ecde76 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(const GrColor4h&,
+static sk_sp<GrGeometryProcessor> make_dash_gp(const SkPMColor4f&,
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(GrColor4h::FromFloats(paint.getColor4f().vec()))
+ , fColor(paint.getColor4f())
, fFullDash(fullDash)
, fCap(cap)
, fAAMode(aaMode)
@@ -734,7 +734,7 @@
return CombineResult::kMerged;
}
- const GrColor4h& color() const { return fColor; }
+ const SkPMColor4f& 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;
- GrColor4h fColor;
+ SkPMColor4f fColor;
bool fDisallowCombineOnTouchOrOverlap : 1;
bool fUsesLocalCoords : 1;
bool fFullDash : 1;
@@ -834,7 +834,7 @@
public:
typedef SkPathEffect::DashInfo DashInfo;
- static sk_sp<GrGeometryProcessor> Make(const GrColor4h&,
+ static sk_sp<GrGeometryProcessor> Make(const SkPMColor4f&,
AAMode aaMode,
const SkMatrix& localMatrix,
bool usesLocalCoords);
@@ -843,7 +843,7 @@
AAMode aaMode() const { return fAAMode; }
- const GrColor4h& color() const { return fColor; }
+ const SkPMColor4f& color() const { return fColor; }
const SkMatrix& localMatrix() const { return fLocalMatrix; }
@@ -854,14 +854,14 @@
GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const override;
private:
- DashingCircleEffect(const GrColor4h&, AAMode aaMode, const SkMatrix& localMatrix,
+ DashingCircleEffect(const SkPMColor4f&, AAMode aaMode, const SkMatrix& localMatrix,
bool usesLocalCoords);
const Attribute& onVertexAttribute(int i) const override {
return IthAttribute(i, kInPosition, kInDashParams, kInCircleParams);
}
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkMatrix fLocalMatrix;
bool fUsesLocalCoords;
AAMode fAAMode;
@@ -899,7 +899,7 @@
private:
UniformHandle fParamUniform;
UniformHandle fColorUniform;
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkScalar fPrevRadius;
SkScalar fPrevCenterX;
SkScalar fPrevIntervalLength;
@@ -907,7 +907,7 @@
};
GLDashingCircleEffect::GLDashingCircleEffect() {
- fColor = GrColor4h_ILLEGAL;
+ fColor = SK_PMColor4fILLEGAL;
fPrevRadius = SK_ScalarMin;
fPrevCenterX = SK_ScalarMin;
fPrevIntervalLength = SK_ScalarMax;
@@ -970,9 +970,7 @@
FPCoordTransformIter&& transformIter) {
const DashingCircleEffect& dce = processor.cast<DashingCircleEffect>();
if (dce.color() != fColor) {
- float c[4];
- dce.color().toFloats(c);
- pdman.set4fv(fColorUniform, 1, c);
+ pdman.set4fv(fColorUniform, 1, dce.color().vec());
fColor = dce.color();
}
this->setTransformDataHelper(dce.localMatrix(), pdman, &transformIter);
@@ -990,7 +988,7 @@
//////////////////////////////////////////////////////////////////////////////
-sk_sp<GrGeometryProcessor> DashingCircleEffect::Make(const GrColor4h& color,
+sk_sp<GrGeometryProcessor> DashingCircleEffect::Make(const SkPMColor4f& color,
AAMode aaMode,
const SkMatrix& localMatrix,
bool usesLocalCoords) {
@@ -1007,7 +1005,7 @@
return new GLDashingCircleEffect();
}
-DashingCircleEffect::DashingCircleEffect(const GrColor4h& color,
+DashingCircleEffect::DashingCircleEffect(const SkPMColor4f& color,
AAMode aaMode,
const SkMatrix& localMatrix,
bool usesLocalCoords)
@@ -1024,7 +1022,7 @@
#if GR_TEST_UTILS
sk_sp<GrGeometryProcessor> DashingCircleEffect::TestCreate(GrProcessorTestData* d) {
AAMode aaMode = static_cast<AAMode>(d->fRandom->nextULessThan(GrDashOp::kAAModeCnt));
- return DashingCircleEffect::Make(GrColor4h::FromGrColor(GrRandomColor(d->fRandom)),
+ return DashingCircleEffect::Make(SkPMColor4f::FromBytes_RGBA(GrRandomColor(d->fRandom)),
aaMode, GrTest::TestMatrix(d->fRandom),
d->fRandom->nextBool());
}
@@ -1047,7 +1045,7 @@
public:
typedef SkPathEffect::DashInfo DashInfo;
- static sk_sp<GrGeometryProcessor> Make(const GrColor4h&,
+ static sk_sp<GrGeometryProcessor> Make(const SkPMColor4f&,
AAMode aaMode,
const SkMatrix& localMatrix,
bool usesLocalCoords);
@@ -1056,7 +1054,7 @@
AAMode aaMode() const { return fAAMode; }
- const GrColor4h& color() const { return fColor; }
+ const SkPMColor4f& color() const { return fColor; }
const SkMatrix& localMatrix() const { return fLocalMatrix; }
@@ -1067,14 +1065,14 @@
GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const override;
private:
- DashingLineEffect(const GrColor4h&, AAMode aaMode, const SkMatrix& localMatrix,
+ DashingLineEffect(const SkPMColor4f&, AAMode aaMode, const SkMatrix& localMatrix,
bool usesLocalCoords);
const Attribute& onVertexAttribute(int i) const override {
return IthAttribute(i, kInPosition, kInDashParams, kInRectParams);
}
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkMatrix fLocalMatrix;
bool fUsesLocalCoords;
AAMode fAAMode;
@@ -1112,12 +1110,12 @@
FPCoordTransformIter&& iter) override;
private:
- GrColor4h fColor;
+ SkPMColor4f fColor;
UniformHandle fColorUniform;
typedef GrGLSLGeometryProcessor INHERITED;
};
-GLDashingLineEffect::GLDashingLineEffect() : fColor(GrColor4h_ILLEGAL) {}
+GLDashingLineEffect::GLDashingLineEffect() : fColor(SK_PMColor4fILLEGAL) {}
void GLDashingLineEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
const DashingLineEffect& de = args.fGP.cast<DashingLineEffect>();
@@ -1196,9 +1194,7 @@
FPCoordTransformIter&& transformIter) {
const DashingLineEffect& de = processor.cast<DashingLineEffect>();
if (de.color() != fColor) {
- float c[4];
- de.color().toFloats(c);
- pdman.set4fv(fColorUniform, 1, c);
+ pdman.set4fv(fColorUniform, 1, de.color().vec());
fColor = de.color();
}
this->setTransformDataHelper(de.localMatrix(), pdman, &transformIter);
@@ -1216,7 +1212,7 @@
//////////////////////////////////////////////////////////////////////////////
-sk_sp<GrGeometryProcessor> DashingLineEffect::Make(const GrColor4h& color,
+sk_sp<GrGeometryProcessor> DashingLineEffect::Make(const SkPMColor4f& color,
AAMode aaMode,
const SkMatrix& localMatrix,
bool usesLocalCoords) {
@@ -1233,7 +1229,7 @@
return new GLDashingLineEffect();
}
-DashingLineEffect::DashingLineEffect(const GrColor4h& color,
+DashingLineEffect::DashingLineEffect(const SkPMColor4f& color,
AAMode aaMode,
const SkMatrix& localMatrix,
bool usesLocalCoords)
@@ -1250,7 +1246,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(GrColor4h::FromGrColor(GrRandomColor(d->fRandom)),
+ return DashingLineEffect::Make(SkPMColor4f::FromBytes_RGBA(GrRandomColor(d->fRandom)),
aaMode, GrTest::TestMatrix(d->fRandom),
d->fRandom->nextBool());
}
@@ -1258,7 +1254,7 @@
#endif
//////////////////////////////////////////////////////////////////////////////
-static sk_sp<GrGeometryProcessor> make_dash_gp(const GrColor4h& color,
+static sk_sp<GrGeometryProcessor> make_dash_gp(const SkPMColor4f& color,
AAMode aaMode,
DashCap cap,
const SkMatrix& viewMatrix,
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index afb63c9..c2e1d69 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.toGrColor(), fPaths.count());
+ string.appendf("Color: 0x%08x Count: %d\n", fColor.toBytes_RGBA(), 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, const GrColor4h& color, const SkPath& path,
+ DefaultPathOp(const Helper::MakeArgs& helperArgs, const SkPMColor4f& 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;
}
- const GrColor4h& color() const { return fColor; }
+ const SkPMColor4f& 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;
- GrColor4h fColor;
+ SkPMColor4f fColor;
uint8_t fCoverage;
SkMatrix fViewMatrix;
bool fIsHairline;
diff --git a/src/gpu/ops/GrDrawAtlasOp.cpp b/src/gpu/ops/GrDrawAtlasOp.cpp
index 87cb2fe..e34df8d 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,
- const GrColor4h& color,
+ const SkPMColor4f& color,
const SkMatrix& viewMatrix) {
using namespace GrDefaultGeoProcFactory;
Color gpColor(color);
@@ -27,7 +27,7 @@
LocalCoords::kHasExplicit_Type, viewMatrix);
}
-GrDrawAtlasOp::GrDrawAtlasOp(const Helper::MakeArgs& helperArgs, const GrColor4h& color,
+GrDrawAtlasOp::GrDrawAtlasOp(const Helper::MakeArgs& helperArgs, const SkPMColor4f& color,
const SkMatrix& viewMatrix, GrAAType aaType, int spriteCount,
const SkRSXform* xforms, const SkRect* rects, const SkColor* colors)
: INHERITED(ClassID()), fHelper(helperArgs, aaType), fColor(color) {
@@ -56,7 +56,7 @@
SkRect bounds = SkRectPriv::MakeLargestInverted();
// TODO4F: Preserve float colors
- int paintAlpha = GrColorUnpackA(installedGeo.fColor.toGrColor());
+ int paintAlpha = GrColorUnpackA(installedGeo.fColor.toBytes_RGBA());
for (int spriteIndex = 0; spriteIndex < spriteCount; ++spriteIndex) {
// Transform rect
SkPoint strip[4];
@@ -112,7 +112,8 @@
SkString GrDrawAtlasOp::dumpInfo() const {
SkString string;
for (const auto& geo : fGeoData) {
- string.appendf("Color: 0x%08x, Quads: %d\n", geo.fColor.toGrColor(), geo.fVerts.count()/4);
+ string.appendf("Color: 0x%08x, Quads: %d\n", geo.fColor.toBytes_RGBA(),
+ 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 3457177..16d0520 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, const GrColor4h& color,
+ GrDrawAtlasOp(const Helper::MakeArgs& helperArgs, const SkPMColor4f& 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;
- const GrColor4h& color() const { return fColor; }
+ const SkPMColor4f& 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 {
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkTArray<uint8_t, true> fVerts;
};
SkSTArray<1, Geometry, true> fGeoData;
Helper fHelper;
SkMatrix fViewMatrix;
- GrColor4h fColor;
+ SkPMColor4f fColor;
int fQuadCount;
bool fHasColors;
diff --git a/src/gpu/ops/GrDrawPathOp.cpp b/src/gpu/ops/GrDrawPathOp.cpp
index 4e75b57..c1004b6 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(GrColor4h::FromFloats(paint.getColor4f().vec()))
+ , fInputColor(paint.getColor4f())
, fFillType(fill)
, fAAType(aaType)
, fProcessorSet(std::move(paint)) {}
diff --git a/src/gpu/ops/GrDrawPathOp.h b/src/gpu/ops/GrDrawPathOp.h
index 9620126..1441504 100644
--- a/src/gpu/ops/GrDrawPathOp.h
+++ b/src/gpu/ops/GrDrawPathOp.h
@@ -40,7 +40,7 @@
protected:
const SkMatrix& viewMatrix() const { return fViewMatrix; }
- const GrColor4h& color() const { return fInputColor; }
+ const SkPMColor4f& 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;
- GrColor4h fInputColor;
+ SkPMColor4f fInputColor;
GrProcessorSet::Analysis fAnalysis;
GrPathRendering::FillType fFillType;
GrAAType fAAType;
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index 1d3ff0e..26372ce 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, const GrColor4h& color,
+GrDrawVerticesOp::GrDrawVerticesOp(const Helper::MakeArgs& helperArgs, const SkPMColor4f& color,
sk_sp<SkVertices> vertices, const SkVertices::Bone bones[],
int boneCount, GrPrimitiveType primitiveType, GrAAType aaType,
sk_sp<GrColorSpaceXform> colorSpaceXform,
@@ -427,7 +427,7 @@
size_t boneWeightOffset = offset;
// TODO4F: Preserve float colors
- GrColor color = mesh.fColor.toGrColor();
+ GrColor color = mesh.fColor.toBytes_RGBA();
for (int j = 0; j < vertexCount; ++j) {
if (this->hasMultipleViewMatrices()) {
diff --git a/src/gpu/ops/GrDrawVerticesOp.h b/src/gpu/ops/GrDrawVerticesOp.h
index bd72be6..bab51ae 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&, const GrColor4h&, sk_sp<SkVertices>,
+ GrDrawVerticesOp(const Helper::MakeArgs&, const SkPMColor4f&, 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 {
- GrColor4h fColor; // Used if this->hasPerVertexColors() is false.
+ SkPMColor4f 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 f252f8a..bdfa895 100644
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@@ -151,10 +151,10 @@
std::move(iter), dst);
}
- NonAALatticeOp(Helper::MakeArgs& helperArgs, const GrColor4h& color, const SkMatrix& viewMatrix,
- sk_sp<GrTextureProxy> proxy, sk_sp<GrColorSpaceXform> colorSpaceXform,
- GrSamplerState::Filter filter, std::unique_ptr<SkLatticeIter> iter,
- const SkRect& dst)
+ NonAALatticeOp(Helper::MakeArgs& helperArgs, const SkPMColor4f& color,
+ const SkMatrix& viewMatrix, sk_sp<GrTextureProxy> proxy,
+ sk_sp<GrColorSpaceXform> colorSpaceXform, GrSamplerState::Filter filter,
+ std::unique_ptr<SkLatticeIter> iter, const SkRect& dst)
: INHERITED(ClassID())
, fHelper(helperArgs, GrAAType::kNone)
, fProxy(std::move(proxy))
@@ -182,7 +182,7 @@
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.toGrColor(), fPatches[i].fDst.fLeft,
+ fPatches[i].fColor.toBytes_RGBA(), fPatches[i].fDst.fLeft,
fPatches[i].fDst.fTop, fPatches[i].fDst.fRight, fPatches[i].fDst.fBottom);
}
@@ -239,7 +239,7 @@
for (int i = 0; i < patchCnt; i++) {
const Patch& patch = fPatches[i];
// TODO4F: Preserve float colors
- GrColor patchColor = patch.fColor.toGrColor();
+ GrColor patchColor = patch.fColor.toBytes_RGBA();
// Apply the view matrix here if it is scale-translate. Otherwise, we need to
// wait until we've created the dst rects.
@@ -315,7 +315,7 @@
SkMatrix fViewMatrix;
std::unique_ptr<SkLatticeIter> fIter;
SkRect fDst;
- GrColor4h fColor;
+ SkPMColor4f fColor;
};
Helper fHelper;
diff --git a/src/gpu/ops/GrNonAAFillRectOp.cpp b/src/gpu/ops/GrNonAAFillRectOp.cpp
index b0a01cc..743845f 100644
--- a/src/gpu/ops/GrNonAAFillRectOp.cpp
+++ b/src/gpu/ops/GrNonAAFillRectOp.cpp
@@ -125,7 +125,7 @@
NonAAFillRectOp() = delete;
- NonAAFillRectOp(const Helper::MakeArgs& args, const GrColor4h& color,
+ NonAAFillRectOp(const Helper::MakeArgs& args, const SkPMColor4f& color,
const SkMatrix& viewMatrix, const SkRect& rect, const SkRect* localRect,
const SkMatrix* localMatrix, GrAAType aaType,
const GrUserStencilSettings* stencilSettings)
@@ -161,7 +161,7 @@
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.toGrColor(), info.fRect.fLeft, info.fRect.fTop,
+ info.fColor.toBytes_RGBA(), info.fRect.fLeft, info.fRect.fTop,
info.fRect.fRight, info.fRect.fBottom);
}
str += fHelper.dumpInfo();
@@ -170,7 +170,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor4h* color = &fRects.front().fColor;
+ SkPMColor4f* color = &fRects.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kNone, color);
}
@@ -205,7 +205,7 @@
intptr_t verts =
reinterpret_cast<intptr_t>(vertices) + i * kVertsPerRect * kVertexStride;
// TODO4F: Preserve float colors
- tesselate(verts, kVertexStride, fRects[i].fColor.toGrColor(), &fRects[i].fViewMatrix,
+ tesselate(verts, kVertexStride, fRects[i].fColor.toBytes_RGBA(), &fRects[i].fViewMatrix,
fRects[i].fRect, &fRects[i].fLocalQuad);
}
auto pipe = fHelper.makePipeline(target);
@@ -222,7 +222,7 @@
}
struct RectInfo {
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkMatrix fViewMatrix;
SkRect fRect;
GrQuad fLocalQuad;
@@ -256,7 +256,7 @@
NonAAFillRectPerspectiveOp() = delete;
- NonAAFillRectPerspectiveOp(const Helper::MakeArgs& args, const GrColor4h& color,
+ NonAAFillRectPerspectiveOp(const Helper::MakeArgs& args, const SkPMColor4f& color,
const SkMatrix& viewMatrix, const SkRect& rect,
const SkRect* localRect, const SkMatrix* localMatrix,
GrAAType aaType, const GrUserStencilSettings* stencilSettings)
@@ -290,7 +290,7 @@
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.toGrColor(), geo.fRect.fLeft, geo.fRect.fTop,
+ geo.fColor.toBytes_RGBA(), geo.fRect.fLeft, geo.fRect.fTop,
geo.fRect.fRight, geo.fRect.fBottom);
}
str += fHelper.dumpInfo();
@@ -299,7 +299,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor4h* color = &fRects.front().fColor;
+ SkPMColor4f* color = &fRects.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kNone, color);
}
@@ -337,7 +337,7 @@
for (int i = 0; i < rectCount; i++) {
const RectInfo& info = fRects[i];
// TODO4F: Preserve float colors
- GrColor color = info.fColor.toGrColor();
+ GrColor color = info.fColor.toBytes_RGBA();
intptr_t verts =
reinterpret_cast<intptr_t>(vertices) + i * kVertsPerRect * vertexStride;
if (fHasLocalRect) {
@@ -374,7 +374,7 @@
struct RectInfo {
SkRect fRect;
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkRect fLocalRect;
};
diff --git a/src/gpu/ops/GrNonAAStrokeRectOp.cpp b/src/gpu/ops/GrNonAAStrokeRectOp.cpp
index 6b015a0..fef7f09 100644
--- a/src/gpu/ops/GrNonAAStrokeRectOp.cpp
+++ b/src/gpu/ops/GrNonAAStrokeRectOp.cpp
@@ -72,7 +72,7 @@
string.appendf(
"Color: 0x%08x, Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f], "
"StrokeWidth: %.2f\n",
- fColor.toGrColor(), fRect.fLeft, fRect.fTop, fRect.fRight, fRect.fBottom,
+ fColor.toBytes_RGBA(), fRect.fLeft, fRect.fTop, fRect.fRight, fRect.fBottom,
fStrokeWidth);
string += fHelper.dumpInfo();
string += INHERITED::dumpInfo();
@@ -100,7 +100,7 @@
stroke, aaType);
}
- NonAAStrokeRectOp(const Helper::MakeArgs& helperArgs, const GrColor4h& color,
+ NonAAStrokeRectOp(const Helper::MakeArgs& helperArgs, const SkPMColor4f& color,
Helper::Flags flags, const SkMatrix& viewMatrix, const SkRect& rect,
const SkStrokeRec& stroke, GrAAType aaType)
: INHERITED(ClassID()), fHelper(helperArgs, aaType, flags) {
@@ -199,7 +199,7 @@
// TODO: override onCombineIfPossible
Helper fHelper;
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkMatrix fViewMatrix;
SkRect fRect;
SkScalar fStrokeWidth;
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index 1e06e62..dc9aa58 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -957,8 +957,9 @@
radius, style, arcParams);
}
- CircleOp(const Helper::MakeArgs& helperArgs, const GrColor4h& color, const SkMatrix& viewMatrix,
- SkPoint center, SkScalar radius, const GrStyle& style, const ArcParams* arcParams)
+ CircleOp(const Helper::MakeArgs& helperArgs, const SkPMColor4f& 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();
SkStrokeRec::Style recStyle = stroke.getStyle();
@@ -1147,7 +1148,7 @@
string.appendf(
"Color: 0x%08x Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f],"
"InnerRad: %.2f, OuterRad: %.2f\n",
- fCircles[i].fColor.toGrColor(), fCircles[i].fDevBounds.fLeft,
+ fCircles[i].fColor.toBytes_RGBA(), fCircles[i].fDevBounds.fLeft,
fCircles[i].fDevBounds.fTop, fCircles[i].fDevBounds.fRight,
fCircles[i].fDevBounds.fBottom, fCircles[i].fInnerRadius,
fCircles[i].fOuterRadius);
@@ -1158,7 +1159,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor4h* color = &fCircles.front().fColor;
+ SkPMColor4f* color = &fCircles.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kSingleChannel,
color);
}
@@ -1218,7 +1219,7 @@
SkScalar innerRadius = circle.fInnerRadius;
SkScalar outerRadius = circle.fOuterRadius;
// TODO4F: Preserve float colors
- GrColor color = circle.fColor.toGrColor();
+ GrColor color = circle.fColor.toBytes_RGBA();
const SkRect& bounds = circle.fDevBounds;
CircleVertex* v0 = reinterpret_cast<CircleVertex*>(vertices + 0 * vertexStride);
@@ -1528,7 +1529,7 @@
}
struct Circle {
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkScalar fInnerRadius;
SkScalar fOuterRadius;
SkScalar fClipPlane[3];
@@ -1577,7 +1578,7 @@
onAngle, offAngle, phaseAngle);
}
- ButtCapDashedCircleOp(const Helper::MakeArgs& helperArgs, const GrColor4h& color,
+ ButtCapDashedCircleOp(const Helper::MakeArgs& helperArgs, const SkPMColor4f& color,
const SkMatrix& viewMatrix, SkPoint center, SkScalar radius,
SkScalar strokeWidth, SkScalar startAngle, SkScalar onAngle,
SkScalar offAngle, SkScalar phaseAngle)
@@ -1662,7 +1663,7 @@
"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.toGrColor(), fCircles[i].fDevBounds.fLeft,
+ fCircles[i].fColor.toBytes_RGBA(), 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,
@@ -1674,7 +1675,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor4h* color = &fCircles.front().fColor;
+ SkPMColor4f* color = &fCircles.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kSingleChannel,
color);
}
@@ -1738,7 +1739,7 @@
}
// TODO4F: Preserve float colors
- GrColor color = circle.fColor.toGrColor();
+ GrColor color = circle.fColor.toBytes_RGBA();
// The bounding geometry for the circle is composed of an outer bounding octagon and
// an inner bounded octagon.
@@ -1841,7 +1842,7 @@
}
struct Circle {
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkScalar fOuterRadius;
SkScalar fInnerRadius;
SkScalar fOnAngle;
@@ -1943,7 +1944,7 @@
params, stroke);
}
- EllipseOp(const Helper::MakeArgs& helperArgs, const GrColor4h& color,
+ EllipseOp(const Helper::MakeArgs& helperArgs, const SkPMColor4f& color,
const SkMatrix& viewMatrix, const DeviceSpaceParams& params,
const SkStrokeRec& stroke)
: INHERITED(ClassID()), fHelper(helperArgs, GrAAType::kCoverage) {
@@ -1980,7 +1981,7 @@
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.toGrColor(), geo.fDevBounds.fLeft, geo.fDevBounds.fTop,
+ geo.fColor.toBytes_RGBA(), geo.fDevBounds.fLeft, geo.fDevBounds.fTop,
geo.fDevBounds.fRight, geo.fDevBounds.fBottom, geo.fXRadius, geo.fYRadius,
geo.fInnerXRadius, geo.fInnerYRadius);
}
@@ -1990,7 +1991,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor4h* color = &fEllipses.front().fColor;
+ SkPMColor4f* color = &fEllipses.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kSingleChannel,
color);
}
@@ -2016,7 +2017,7 @@
for (const auto& ellipse : fEllipses) {
// TODO4F: Preserve float colors
- GrColor color = ellipse.fColor.toGrColor();
+ GrColor color = ellipse.fColor.toBytes_RGBA();
SkScalar xRadius = ellipse.fXRadius;
SkScalar yRadius = ellipse.fYRadius;
@@ -2087,7 +2088,7 @@
}
struct Ellipse {
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkScalar fXRadius;
SkScalar fYRadius;
SkScalar fInnerXRadius;
@@ -2182,7 +2183,7 @@
return Helper::FactoryHelper<DIEllipseOp>(context, std::move(paint), params, viewMatrix);
}
- DIEllipseOp(Helper::MakeArgs& helperArgs, const GrColor4h& color,
+ DIEllipseOp(Helper::MakeArgs& helperArgs, const SkPMColor4f& 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
@@ -2217,7 +2218,7 @@
"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.toGrColor(), geo.fBounds.fLeft, geo.fBounds.fTop,
+ geo.fColor.toBytes_RGBA(), geo.fBounds.fLeft, geo.fBounds.fTop,
geo.fBounds.fRight, geo.fBounds.fBottom, geo.fXRadius, geo.fYRadius,
geo.fInnerXRadius, geo.fInnerYRadius, geo.fGeoDx, geo.fGeoDy);
}
@@ -2227,7 +2228,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor4h* color = &fEllipses.front().fColor;
+ SkPMColor4f* color = &fEllipses.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kSingleChannel,
color);
}
@@ -2249,7 +2250,7 @@
for (const auto& ellipse : fEllipses) {
// TODO4F: Preserve float colors
- GrColor color = ellipse.fColor.toGrColor();
+ GrColor color = ellipse.fColor.toBytes_RGBA();
SkScalar xRadius = ellipse.fXRadius;
SkScalar yRadius = ellipse.fYRadius;
@@ -2323,7 +2324,7 @@
struct Ellipse {
SkMatrix fViewMatrix;
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkScalar fXRadius;
SkScalar fYRadius;
SkScalar fInnerXRadius;
@@ -2486,7 +2487,7 @@
devRect, devRadius,
devStrokeWidth, strokeOnly);
}
- CircularRRectOp(Helper::MakeArgs& helperArgs, const GrColor4h& color,
+ CircularRRectOp(Helper::MakeArgs& helperArgs, const SkPMColor4f& color,
const SkMatrix& viewMatrix, const SkRect& devRect, float devRadius,
float devStrokeWidth, bool strokeOnly)
: INHERITED(ClassID())
@@ -2550,7 +2551,7 @@
string.appendf(
"Color: 0x%08x Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f],"
"InnerRad: %.2f, OuterRad: %.2f\n",
- fRRects[i].fColor.toGrColor(), fRRects[i].fDevBounds.fLeft,
+ fRRects[i].fColor.toBytes_RGBA(), fRRects[i].fDevBounds.fLeft,
fRRects[i].fDevBounds.fTop, fRRects[i].fDevBounds.fRight,
fRRects[i].fDevBounds.fBottom, fRRects[i].fInnerRadius,
fRRects[i].fOuterRadius);
@@ -2561,7 +2562,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor4h* color = &fRRects.front().fColor;
+ SkPMColor4f* color = &fRRects.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kSingleChannel,
color);
}
@@ -2678,7 +2679,7 @@
int currStartVertex = 0;
for (const auto& rrect : fRRects) {
// TODO4F: Preserve float colors
- GrColor color = rrect.fColor.toGrColor();
+ GrColor color = rrect.fColor.toBytes_RGBA();
SkScalar outerRadius = rrect.fOuterRadius;
const SkRect& bounds = rrect.fDevBounds;
@@ -2782,7 +2783,7 @@
}
struct RRect {
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkScalar fInnerRadius;
SkScalar fOuterRadius;
SkRect fDevBounds;
@@ -2873,7 +2874,7 @@
strokeOnly);
}
- EllipticalRRectOp(Helper::MakeArgs helperArgs, const GrColor4h& color,
+ EllipticalRRectOp(Helper::MakeArgs helperArgs, const SkPMColor4f& color,
const SkMatrix& viewMatrix, const SkRect& devRect, float devXRadius,
float devYRadius, SkVector devStrokeHalfWidths, bool strokeOnly)
: INHERITED(ClassID()), fHelper(helperArgs, GrAAType::kCoverage) {
@@ -2916,7 +2917,7 @@
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.toGrColor(), geo.fDevBounds.fLeft, geo.fDevBounds.fTop,
+ geo.fColor.toBytes_RGBA(), geo.fDevBounds.fLeft, geo.fDevBounds.fTop,
geo.fDevBounds.fRight, geo.fDevBounds.fBottom, geo.fXRadius, geo.fYRadius,
geo.fInnerXRadius, geo.fInnerYRadius);
}
@@ -2926,7 +2927,7 @@
}
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
- GrColor4h* color = &fRRects.front().fColor;
+ SkPMColor4f* color = &fRRects.front().fColor;
return fHelper.xpRequiresDstTexture(caps, clip, GrProcessorAnalysisCoverage::kSingleChannel,
color);
}
@@ -2961,7 +2962,7 @@
for (const auto& rrect : fRRects) {
// TODO4F: Preserve float colors
- GrColor color = rrect.fColor.toGrColor();
+ GrColor color = rrect.fColor.toBytes_RGBA();
// Compute the reciprocals of the radii here to save time in the shader
SkScalar xRadRecip = SkScalarInvert(rrect.fXRadius);
SkScalar yRadRecip = SkScalarInvert(rrect.fYRadius);
@@ -3045,7 +3046,7 @@
}
struct RRect {
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkScalar fXRadius;
SkScalar fYRadius;
SkScalar fInnerXRadius;
diff --git a/src/gpu/ops/GrRegionOp.cpp b/src/gpu/ops/GrRegionOp.cpp
index 2ce89de..34fa6a9 100644
--- a/src/gpu/ops/GrRegionOp.cpp
+++ b/src/gpu/ops/GrRegionOp.cpp
@@ -70,8 +70,9 @@
aaType, stencilSettings);
}
- RegionOp(const Helper::MakeArgs& helperArgs, const GrColor4h& color, const SkMatrix& viewMatrix,
- const SkRegion& region, GrAAType aaType, const GrUserStencilSettings* stencilSettings)
+ RegionOp(const Helper::MakeArgs& helperArgs, const SkPMColor4f& color,
+ const SkMatrix& viewMatrix, const SkRegion& region, GrAAType aaType,
+ const GrUserStencilSettings* stencilSettings)
: INHERITED(ClassID())
, fHelper(helperArgs, aaType, stencilSettings)
, fViewMatrix(viewMatrix) {
@@ -94,7 +95,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.toGrColor(),
+ str.appendf("%d: Color: 0x%08x, Region with %d rects\n", i, info.fColor.toBytes_RGBA(),
info.fRegion.computeRegionComplexity());
}
str += fHelper.dumpInfo();
@@ -140,7 +141,7 @@
intptr_t verts = reinterpret_cast<intptr_t>(vertices);
for (int i = 0; i < numRegions; i++) {
// TODO4F: Preserve float colors
- tesselate_region(verts, kVertexStride, fRegions[i].fColor.toGrColor(),
+ tesselate_region(verts, kVertexStride, fRegions[i].fColor.toBytes_RGBA(),
fRegions[i].fRegion);
int numRectsInRegion = fRegions[i].fRegion.computeRegionComplexity();
verts += numRectsInRegion * kVertsPerInstance * kVertexStride;
@@ -164,7 +165,7 @@
}
struct RegionInfo {
- GrColor4h fColor;
+ SkPMColor4f fColor;
SkRegion fRegion;
};
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
index f542608..32e4246 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;
- GrColor4h overrideColor;
+ SkPMColor4f 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,
- GrColor4h* geometryColor) {
+ SkPMColor4f* 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 bb7bbe9..76377a0 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,
- GrColor4h* geometryColor);
+ SkPMColor4f* geometryColor);
bool usesLocalCoords() const {
SkASSERT(fDidAnalysis);
@@ -182,17 +182,16 @@
GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
MakeArgs makeArgs;
- GrColor4h color = GrColor4h::FromFloats(paint.getColor4f().vec());
if (paint.isTrivial()) {
makeArgs.fProcessorSet = nullptr;
- return pool->allocate<Op>(makeArgs, color, std::forward<OpArgs>(opArgs)...);
+ return pool->allocate<Op>(makeArgs, paint.getColor4f(), std::forward<OpArgs>(opArgs)...);
} else {
char* mem = (char*) pool->allocate(sizeof(Op) + sizeof(GrProcessorSet));
char* setMem = mem + sizeof(Op);
makeArgs.fProcessorSet = new (setMem) GrProcessorSet(std::move(paint));
- return std::unique_ptr<GrDrawOp>(new (mem) Op(makeArgs, color,
+ return std::unique_ptr<GrDrawOp>(new (mem) Op(makeArgs, paint.getColor4f(),
std::forward<OpArgs>(opArgs)...));
}
}
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index 4b88542..4f6057e 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -242,7 +242,7 @@
stencilSettings);
}
- SmallPathOp(Helper::MakeArgs helperArgs, const GrColor4h& color, const GrShape& shape,
+ SmallPathOp(Helper::MakeArgs helperArgs, const SkPMColor4f& 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.toGrColor());
+ string.appendf("Color: 0x%08x\n", geo.fColor.toBytes_RGBA());
}
string += fHelper.dumpInfo();
string += INHERITED::dumpInfo();
@@ -492,8 +492,8 @@
fAtlas->setLastUseToken(shapeData->fID, uploadTarget->tokenTracker()->nextDrawToken());
// TODO4F: Preserve float colors
- this->writePathVertices(
- fAtlas, offset, args.fColor.toGrColor(), kVertexStride, args.fViewMatrix, shapeData);
+ this->writePathVertices(fAtlas, offset, args.fColor.toBytes_RGBA(), kVertexStride,
+ args.fViewMatrix, shapeData);
offset += kVerticesPerQuad * kVertexStride;
flushInfo.fInstancesToFlush++;
}
@@ -846,7 +846,7 @@
}
}
- const GrColor4h& color() const { return fShapes[0].fColor; }
+ const SkPMColor4f& color() const { return fShapes[0].fColor; }
bool usesDistanceField() const { return fUsesDistanceField; }
CombineResult onCombineIfPossible(GrOp* t, const GrCaps& caps) override {
@@ -888,9 +888,9 @@
bool fUsesDistanceField;
struct Entry {
- GrColor4h fColor;
- GrShape fShape;
- SkMatrix fViewMatrix;
+ SkPMColor4f fColor;
+ GrShape fShape;
+ SkMatrix fViewMatrix;
};
SkSTArray<1, Entry> fShapes;
diff --git a/src/gpu/ops/GrTessellatingPathRenderer.cpp b/src/gpu/ops/GrTessellatingPathRenderer.cpp
index f5ab08c..4f343c6 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.toGrColor(), fAntiAlias);
+ string.appendf("Color 0x%08x, aa: %d\n", fColor.toBytes_RGBA(), fAntiAlias);
string += fHelper.dumpInfo();
string += INHERITED::dumpInfo();
return string;
}
TessellatingPathOp(Helper::MakeArgs helperArgs,
- const GrColor4h& color,
+ const SkPMColor4f& color,
const GrShape& shape,
const SkMatrix& viewMatrix,
const SkIRect& devClipBounds,
@@ -303,7 +303,7 @@
// TODO4F: Preserve float colors
int count =
GrTessellator::PathToTriangles(path, tol, clipBounds, &allocator, true,
- fColor.toGrColor(),
+ fColor.toBytes_RGBA(),
fHelper.compatibleWithAlphaAsCoverage(), &isLinear);
if (count == 0) {
return;
@@ -369,7 +369,7 @@
}
Helper fHelper;
- GrColor4h fColor;
+ SkPMColor4f fColor;
GrShape fShape;
SkMatrix fViewMatrix;
SkIRect fDevClipBounds;
diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp
index c6274b7..cc686f5 100644
--- a/src/gpu/text/GrTextBlob.cpp
+++ b/src/gpu/text/GrTextBlob.cpp
@@ -79,11 +79,11 @@
void GrTextBlob::appendGlyph(int runIndex,
const SkRect& positions,
- const GrColor4h& color4f,
+ const SkPMColor4f& color4f,
const sk_sp<GrTextStrike>& strike,
GrGlyph* glyph, bool preTransformed) {
// TODO4F: Preserve float colors
- GrColor color = color4f.toGrColor();
+ GrColor color = color4f.toBytes_RGBA();
Run& run = fRuns[runIndex];
GrMaskFormat format = glyph->fMaskFormat;
@@ -237,7 +237,7 @@
inline std::unique_ptr<GrAtlasTextOp> GrTextBlob::makeOp(
const Run::SubRunInfo& info, int glyphCount, uint16_t run, uint16_t subRun,
const SkMatrix& viewMatrix, SkScalar x, SkScalar y, const SkIRect& clipRect,
- const SkPaint& paint, const GrColor4h& filteredColor, const SkSurfaceProps& props,
+ const SkPaint& paint, const SkPMColor4f& filteredColor, const SkSurfaceProps& props,
const GrDistanceFieldAdjustTable* distanceAdjustTable, GrTextTarget* target) {
GrMaskFormat format = info.maskFormat();
@@ -260,7 +260,7 @@
geometry.fBlob = SkRef(this);
geometry.fRun = run;
geometry.fSubRun = subRun;
- geometry.fColor = info.maskFormat() == kARGB_GrMaskFormat ? GrColor4h_WHITE : filteredColor;
+ geometry.fColor = info.maskFormat() == kARGB_GrMaskFormat ? SK_PMColor4fWHITE : filteredColor;
geometry.fX = x;
geometry.fY = y;
op->init();
@@ -289,7 +289,7 @@
void GrTextBlob::flush(GrTextTarget* target, const SkSurfaceProps& props,
const GrDistanceFieldAdjustTable* distanceAdjustTable,
- const SkPaint& paint, const GrColor4h& filteredColor, const GrClip& clip,
+ const SkPaint& paint, const SkPMColor4f& filteredColor, const GrClip& clip,
const SkMatrix& viewMatrix, SkScalar x, SkScalar y) {
// GrTextBlob::makeOp only takes uint16_t values for run and subRun indices.
@@ -440,7 +440,7 @@
std::unique_ptr<GrDrawOp> GrTextBlob::test_makeOp(
int glyphCount, uint16_t run, uint16_t subRun, const SkMatrix& viewMatrix,
- SkScalar x, SkScalar y, const SkPaint& paint, const GrColor4h& filteredColor,
+ SkScalar x, SkScalar y, const SkPaint& paint, const SkPMColor4f& filteredColor,
const SkSurfaceProps& props, const GrDistanceFieldAdjustTable* distanceAdjustTable,
GrTextTarget* target) {
const GrTextBlob::Run::SubRunInfo& info = fRuns[run].fSubRunInfo[subRun];
diff --git a/src/gpu/text/GrTextBlob.h b/src/gpu/text/GrTextBlob.h
index 01677ad..2b3282f 100644
--- a/src/gpu/text/GrTextBlob.h
+++ b/src/gpu/text/GrTextBlob.h
@@ -176,7 +176,7 @@
// as a path.
void appendGlyph(int runIndex,
const SkRect& positions,
- const GrColor4h& color,
+ const SkPMColor4f& color,
const sk_sp<GrTextStrike>& strike,
GrGlyph* glyph, bool preTransformed);
@@ -201,7 +201,7 @@
void flush(GrTextTarget*, const SkSurfaceProps& props,
const GrDistanceFieldAdjustTable* distanceAdjustTable,
- const SkPaint& paint, const GrColor4h& filteredColor, const GrClip& clip,
+ const SkPaint& paint, const SkPMColor4f& filteredColor, const GrClip& clip,
const SkMatrix& viewMatrix, SkScalar x, SkScalar y);
void computeSubRunBounds(SkRect* outBounds, int runIndex, int subRunIndex,
@@ -276,7 +276,7 @@
// Internal test methods
std::unique_ptr<GrDrawOp> test_makeOp(int glyphCount, uint16_t run, uint16_t subRun,
const SkMatrix& viewMatrix, SkScalar x, SkScalar y,
- const SkPaint& paint, const GrColor4h& filteredColor,
+ const SkPaint& paint, const SkPMColor4f& filteredColor,
const SkSurfaceProps&, const GrDistanceFieldAdjustTable*,
GrTextTarget*);
@@ -513,7 +513,7 @@
inline std::unique_ptr<GrAtlasTextOp> makeOp(
const Run::SubRunInfo& info, int glyphCount, uint16_t run, uint16_t subRun,
const SkMatrix& viewMatrix, SkScalar x, SkScalar y, const SkIRect& clipRect,
- const SkPaint& paint, const GrColor4h& filteredColor, const SkSurfaceProps&,
+ const SkPaint& paint, const SkPMColor4f& filteredColor, const SkSurfaceProps&,
const GrDistanceFieldAdjustTable*, GrTextTarget*);
struct StrokeInfo {
diff --git a/src/gpu/text/GrTextContext.h b/src/gpu/text/GrTextContext.h
index a386f13..d6255e3 100644
--- a/src/gpu/text/GrTextContext.h
+++ b/src/gpu/text/GrTextContext.h
@@ -80,7 +80,7 @@
GrGlyphCache*,
const GrShaderCaps&,
const SkPaint&,
- const GrColor4h& filteredColor,
+ const SkPMColor4f& filteredColor,
SkScalerContextFlags scalerContextFlags,
const SkMatrix& viewMatrix,
const SkSurfaceProps&,
@@ -90,7 +90,7 @@
static void AppendGlyph(GrTextBlob*, int runIndex,
const sk_sp<GrTextStrike>&, const SkGlyph&,
GrGlyph::MaskStyle maskStyle, SkScalar sx, SkScalar sy,
- const GrColor4h& color, SkGlyphCache*, SkScalar textRatio,
+ const SkPMColor4f& color, SkGlyphCache*, SkScalar textRatio,
bool needsTransform);