AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove historical assert in AAConvexPathRenderer

Browse Source 
BUG=skia:

Review URL: https://codereview.chromium.org/944873004
This commit is contained in:
joshualitt 2015-02-20 12:40:45 -08:00 committed by Commit bot
parent 96d68b7046
commit 7abe15d7a9
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gpu/GrAAConvexPathRenderer.cpp
View File

@ -694,7 +694,6 @@ public:
GrColor fColor;
SkMatrix fViewMatrix;
SkPath fPath;
SkDEBUGCODE(SkRect fDevBounds;)
};
static GrBatch* Create(const Geometry& geometry) {
@ -730,7 +729,7 @@ public:
int instanceCount = fGeoData.count();
SkMatrix invert;
if (!this->viewMatrix().invert(&invert)) {
if (this->usesLocalCoords() && !this->viewMatrix().invert(&invert)) {
SkDebugf("Could not invert viewmatrix\n");
return;
}
@ -798,16 +797,6 @@ public:
SkSTArray<kPreallocDrawCnt, Draw, true> draws;
create_vertices(segments, fanPt, &draws, verts, idxs);
#ifdef SK_DEBUG
// Check devBounds
SkRect actualBounds;
actualBounds.set(verts[0].fPos, verts[1].fPos);
for (int i = 2; i < vertexCount; ++i) {
actualBounds.growToInclude(verts[i].fPos.fX, verts[i].fPos.fY);
}
SkASSERT(args.fDevBounds.contains(actualBounds));
#endif
GrDrawTarget::DrawInfo info;
info.setVertexBuffer(vertexBuffer);
info.setIndexBuffer(indexBuffer);
@ -886,7 +875,6 @@ bool GrAAConvexPathRenderer::onDrawPath(GrDrawTarget* target,
geometry.fColor = color;
geometry.fViewMatrix = vm;
geometry.fPath = path;
SkDEBUGCODE(geometry.fDevBounds = devRect;)
SkAutoTUnref<GrBatch> batch(AAConvexPathBatch::Create(geometry));
target->drawBatch(pipelineBuilder, batch, &devRect);