| Index: src/gpu/gl/GrGpuGL_program.cpp
|
| diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp
|
| index dac7443d17123535c5e4fd9595c6b3f5fd38d53e..b19676adb9ba53cc9cefbf7f17f6a55130c35cb4 100644
|
| --- a/src/gpu/gl/GrGpuGL_program.cpp
|
| +++ b/src/gpu/gl/GrGpuGL_program.cpp
|
| @@ -247,9 +247,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();
|
| @@ -261,7 +258,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,
|
|
|