src/gpu/gl/GrGpuGL_program.cpp - Issue 367643004: Implement NVPR on GLES

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/gl/GrGpuGL_program.cpp

Issue 367643004: Implement NVPR on GLES (Closed) Base URL: https://skia.googlesource.com/skia.git@02-path-program-fragment

Patch Set: address review comments (rebase to separated patches) Created 6 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:

Index: src/gpu/gl/GrGpuGL_program.cpp

diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp

index c4011e73142116d6156ccaca204468aa9f856efd..f0ff2c368a8215d4e7ae4bbf30c0454c72a04359 100644

--- a/src/gpu/gl/GrGpuGL_program.cpp

+++ b/src/gpu/gl/GrGpuGL_program.cpp

@@ -258,9 +258,6 @@ bool GrGpuGL::flushGraphicsState(DrawType type, const GrDeviceCoordTexture* dstC

return false;

}

- SkASSERT((kDrawPath_DrawType != type && kDrawPaths_DrawType != type)

- || !fCurrentProgram->hasVertexShader());

fCurrentProgram.get()->ref();

GrGLuint programID = fCurrentProgram->programID();

@@ -272,7 +269,8 @@ bool GrGpuGL::flushGraphicsState(DrawType type, const GrDeviceCoordTexture* dstC

fCurrentProgram->overrideBlend(&srcCoeff, &dstCoeff);

this->flushBlend(kDrawLines_DrawType == type, srcCoeff, dstCoeff);

- fCurrentProgram->setData(blendOpts,

+ fCurrentProgram->setData(type,

+ blendOpts,

colorStages.begin(),

coverageStages.begin(),

dstCopy,