Chromium Code Reviews| Index: src/gpu/gl/GrGLGpu.cpp |
| diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp |
| index aa9a3e664cd2254bee4044c323da4e8347fa65b1..6f27e040ae770c8efb6ecd22d0335a41bcc23720 100644 |
| --- a/src/gpu/gl/GrGLGpu.cpp |
| +++ b/src/gpu/gl/GrGLGpu.cpp |
| @@ -1363,13 +1363,14 @@ bool GrGLGpu::flushGLState(const DrawArgs& args) { |
| this->flushBlend(blendInfo); |
| } |
| - fCurrentProgram->setData(*args.fPrimitiveProcessor, optState, *args.fBatchTracker); |
| + fCurrentProgram->setData(*args.fPrimitiveProcessor, optState, *args.fBatchTracker, |
|
bsalomon
2015/01/21 17:43:30
curious how is draw type used here?
|
| + args.fDrawType); |
| GrGLRenderTarget* glRT = static_cast<GrGLRenderTarget*>(optState.getRenderTarget()); |
| this->flushStencil(optState.getStencil()); |
| this->flushScissor(optState.getScissorState(), glRT->getViewport(), glRT->origin()); |
| this->flushHWAAState(glRT, optState.isHWAntialiasState(), |
| - kDrawLines_DrawType == optState.drawType()); |
| + kDrawLines_DrawType == args.fDrawType); |
| // This must come after textures are flushed because a texture may need |
| // to be msaa-resolved (which will modify bound FBO state). |