src/gpu/GrPipelineBuilder.cpp - Issue 2041283002: Replace targetHasUnifiedMultisampling in GrPB constructor

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/GrPipelineBuilder.cpp

Issue 2041283002: Replace targetHasUnifiedMultisampling in GrPB constructor (Closed) Base URL: https://skia.googlesource.com/skia.git@fixdash

Patch Set: rebase 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:

Index: src/gpu/GrPipelineBuilder.cpp

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

index 04967a780b50b9e9e59796fb232aed73e71116b7..f7848ba9d627d016beb36a79651688560f83dbae 100644

--- a/src/gpu/GrPipelineBuilder.cpp

+++ b/src/gpu/GrPipelineBuilder.cpp

@@ -22,7 +22,7 @@ GrPipelineBuilder::GrPipelineBuilder()

SkDEBUGCODE(fBlockEffectRemovalCnt = 0;)

}

-GrPipelineBuilder::GrPipelineBuilder(const GrPaint& paint, bool targetHasUnifiedMultisampling)

+GrPipelineBuilder::GrPipelineBuilder(const GrPaint& paint, bool useHWAA)

: GrPipelineBuilder() {

SkDEBUGCODE(fBlockEffectRemovalCnt = 0;)

@@ -36,8 +36,7 @@ GrPipelineBuilder::GrPipelineBuilder(const GrPaint& paint, bool targetHasUnified

fXPFactory.reset(SkSafeRef(paint.getXPFactory()));

- this->setState(GrPipelineBuilder::kHWAntialias_Flag,

- targetHasUnifiedMultisampling && paint.isAntiAlias());

+ this->setState(GrPipelineBuilder::kHWAntialias_Flag, useHWAA);

this->setState(GrPipelineBuilder::kDisableOutputConversionToSRGB_Flag,

paint.getDisableOutputConversionToSRGB());

this->setState(GrPipelineBuilder::kAllowSRGBInputs_Flag,

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