src/effects/gradients/SkTwoPointConicalGradient.cpp - Issue 1225673007: Initial CL to create dummy GrShaderDataManager and thread it through

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/gradients/SkTwoPointConicalGradient.cpp

Issue 1225673007: Initial CL to create dummy GrShaderDataManager and thread it through (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: rebase Created 5 years, 5 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

« include/gpu/GrShaderDataManager.h ('K') | « src/effects/gradients/SkTwoPointConicalGradient.h ('k') | src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/effects/gradients/SkTwoPointConicalGradient.cpp

diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp

index 8630d205a88415197c2305c9b821c606ddf06bc6..ee531b271e4c3ffec3cd334c9166b11fe121aa44 100644

--- a/src/effects/gradients/SkTwoPointConicalGradient.cpp

+++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp

@@ -394,6 +394,7 @@ bool SkTwoPointConicalGradient::asFragmentProcessor(GrContext* context,

const SkMatrix& viewM,

const SkMatrix* localMatrix,

GrColor* paintColor,

+ GrShaderDataManager*,

GrFragmentProcessor** fp) const {

SkASSERT(context);

SkASSERT(fPtsToUnit.isIdentity());

@@ -407,7 +408,8 @@ bool SkTwoPointConicalGradient::asFragmentProcessor(GrContext* context,

bool SkTwoPointConicalGradient::asFragmentProcessor(GrContext*, const SkPaint&,

const SkMatrix&, const SkMatrix*,

- GrColor*, GrFragmentProcessor**) const {

+ GrColor*, GrShaderDataManager*,

+ GrFragmentProcessor**) const {

SkDEBUGFAIL("Should not call in GPU-less build");

return false;

}