src/gpu/gl/GrGLProgram.cpp - Issue 820783005: More changes to bring together path / geo procs

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

Issue 820783005: More changes to bring together path / geo procs (Closed) Base URL: https://skia.googlesource.com/skia.git@lc1

Patch Set: some asserts for safety Created 5 years, 11 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/GrGLProgram.cpp

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

index 1af3e56c493f9a2c9a140b1794b646ea3d28c76d..35df5e5959e777ba0e18fca0275087881a7ea3b3 100644

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

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

@@ -231,7 +231,9 @@ void GrGLNvprProgram::setTransformData(const GrPrimitiveProcessor* primProc,

}

void GrGLNvprProgram::onSetRenderTargetState(const GrOptDrawState& optState) {

- SkASSERT(GrGpu::IsPathRenderingDrawType(optState.drawType()));

+ SkASSERT(GrGpu::IsPathRenderingDrawType(optState.drawType()) &&

+ !optState.getPrimitiveProcessor()->willUseGeoShader() &&

+ optState.getPrimitiveProcessor()->getAttribs().count() == 0);

const GrRenderTarget* rt = optState.getRenderTarget();

SkISize size;

size.set(rt->width(), rt->height());