Index: src/gpu/gl/GrGpuGL_program.cpp |
diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp |
index 139d5cfa4496946da11297930ccf4b6ab71bca44..5f426c21e2b3bd9002a44a076224030758d5bbcf 100644 |
--- a/src/gpu/gl/GrGpuGL_program.cpp |
+++ b/src/gpu/gl/GrGpuGL_program.cpp |
@@ -256,9 +256,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(); |
@@ -270,7 +267,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, |