diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-01-14 08:12:47 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-14 08:12:47 -0800 |
| commit | 71c9260e6fa1798ad1e41b2c2ae9b3cce08bb610 (patch) | |
| tree | 6dcf4f549ee113669d8becc37c83225fcba36ba5 /src/gpu/gl/GrGLProgram.cpp | |
| parent | 95145a9d3e0be24769c4c4e3810058e08b06fd3b (diff) | |
More changes to bring together path / geo procs
BUG=skia:
Review URL: https://codereview.chromium.org/820783005
Diffstat (limited to 'src/gpu/gl/GrGLProgram.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLProgram.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index 1af3e56c49..e1f0310bca 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()->numAttribs() == 0); const GrRenderTarget* rt = optState.getRenderTarget(); SkISize size; size.set(rt->width(), rt->height()); |