Index: src/gpu/gl/GrGpuGL_program.cpp |
diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp |
index bd4758c8563028ef266f8a8d0acff5dfbc84c949..bf8058875258bd4b19c61a792d47dee4e1ff878d 100644 |
--- a/src/gpu/gl/GrGpuGL_program.cpp |
+++ b/src/gpu/gl/GrGpuGL_program.cpp |
@@ -253,9 +253,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(); |
@@ -267,7 +264,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, |