Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Unified Diff: src/gpu/GrAAConvexPathRenderer.cpp

Issue 944873004: Remove historical assert in AAConvexPathRenderer (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrAAConvexPathRenderer.cpp
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp
index e3e0d5d5520bcb8a857c346637a66ada5d99444b..3ab8af5c374b21f53d65a3cd36eeb24bb5594254 100644
--- a/src/gpu/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/GrAAConvexPathRenderer.cpp
@@ -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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698