Chromium Code Reviews| Index: src/gpu/gl/GrGpuGL_program.cpp |
| diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp |
| index 26ad9b8f159fa59be32960ea068e5bc2157e5997..18fe9d8d6926adf122714cd4ed85b27953b42325 100644 |
| --- a/src/gpu/gl/GrGpuGL_program.cpp |
| +++ b/src/gpu/gl/GrGpuGL_program.cpp |
| @@ -208,12 +208,14 @@ bool GrGpuGL::flushGraphicsState(DrawType type, const GrDeviceCoordTexture* dstC |
| // GrGpu::setupClipAndFlushState should have already checked this and bailed if not true. |
| SkASSERT(NULL != drawState.getRenderTarget()); |
| - if (kStencilPath_DrawType == type) { |
| + if (kStencilPath_DrawType == type || kDrawPath_DrawType == type) { |
| const GrRenderTarget* rt = this->getDrawState().getRenderTarget(); |
| SkISize size; |
| size.set(rt->width(), rt->height()); |
| this->setProjectionMatrix(drawState.getViewMatrix(), size, rt->origin()); |
| - } else { |
| + } |
| + |
| + if (kStencilPath_DrawType != type) { |
|
Chris Dalton
2013/09/13 19:49:58
Kimmo, we should be able to leave this function as
Kimmo Kinnunen
2013/09/18 07:52:38
But sometimes gpu draw path is selected when the p
Chris Dalton
2013/09/23 02:05:59
When does it use kDrawPath_DrawType with a vertex
bsalomon
2013/10/08 14:05:08
agreed.
|
| this->flushMiscFixedFunctionState(); |
| GrBlendCoeff srcCoeff; |