src/effects/SkDisplacementMapEffect.cpp - Issue 1316513002: Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor*

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/effects/SkDisplacementMapEffect.cpp

Issue 1316513002: Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor* (Closed) Base URL: https://skia.googlesource.com/skia.git@things

Patch Set: fix no-gpu build Created 5 years, 4 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/effects/SkDisplacementMapEffect.cpp

diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp

index 90442843005eabb07a490b194edb651e27f766ab..49290718e391c1eba6f89ca667f41ca444247b1c 100644

--- a/src/effects/SkDisplacementMapEffect.cpp

+++ b/src/effects/SkDisplacementMapEffect.cpp

@@ -517,7 +517,7 @@ void GrDisplacementMapEffect::onComputeInvariantOutput(GrInvariantOutput* inout)

GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrDisplacementMapEffect);

-GrFragmentProcessor* GrDisplacementMapEffect::TestCreate(GrProcessorTestData* d) {

+const GrFragmentProcessor* GrDisplacementMapEffect::TestCreate(GrProcessorTestData* d) {

int texIdxDispl = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :

GrProcessorUnitTest::kAlphaTextureIdx;

int texIdxColor = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :

« src/core/SkPictureShader.cpp ('K') | « src/effects/SkColorMatrixFilter.cpp ('k') | src/effects/SkLightingImageFilter.cpp » ('j') | no next file with comments »