src/gpu/GrPaint.cpp - Issue 2088303002: Add GrColor4f type, store that in GrPaint. Linearize based on global flag.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/gpu/GrPaint.cpp

Issue 2088303002: Add GrColor4f type, store that in GrPaint. Linearize based on global flag. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Fix conversion to SkColor4f with new channel order Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/gpu/GrPaint.cpp

diff --git a/src/gpu/GrPaint.cpp b/src/gpu/GrPaint.cpp

index fd78f9f8191cbab73aa7963034a2ad7ef879d496..02518c0464f6afc9df4a62535089d1dd7c09f542 100644

--- a/src/gpu/GrPaint.cpp

+++ b/src/gpu/GrPaint.cpp

@@ -16,7 +16,7 @@ GrPaint::GrPaint()

: fAntiAlias(false)

, fDisableOutputConversionToSRGB(false)

, fAllowSRGBInputs(false)

- , fColor(GrColor_WHITE) {}

+ , fColor(GrColor4f::FromGrColor(GrColor_WHITE)) {}

void GrPaint::setCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage) {

fXPFactory = GrCoverageSetOpXPFactory::Make(regionOp, invertCoverage);

@@ -46,7 +46,7 @@ bool GrPaint::isConstantBlendedColor(GrColor* color) const {

GrProcOptInfo colorProcInfo;

colorProcInfo.calcWithInitialValues(

sk_sp_address_as_pointer_address(fColorFragmentProcessors.begin()),

- this->numColorFragmentProcessors(), fColor, kRGBA_GrColorComponentFlags, false);

+ this->numColorFragmentProcessors(), this->getColor(), kRGBA_GrColorComponentFlags, false);

GrXPFactory::InvariantBlendedColor blendedColor;

if (fXPFactory) {

« no previous file with comments | « include/gpu/GrPaint.h ('k') | src/gpu/SkGr.cpp » ('j') | no next file with comments »