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

Unified Diff: gm/convexpolyeffect.cpp

Issue 1574383002: Hide drawBatch on GrDrawTarget from test Methods (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rename internal Created 4 years, 11 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
Index: gm/convexpolyeffect.cpp
diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index fb767ddc89f760d4994b6c137d77039fe4045e2e..24081879b35b26485fd6955c77031cc87d6bdf2b 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -14,6 +14,7 @@
#include "GrContext.h"
#include "GrDefaultGeoProcFactory.h"
+#include "GrDrawContext.h"
#include "GrPathUtils.h"
#include "GrTest.h"
#include "SkColorPriv.h"
@@ -32,6 +33,7 @@ class ConvexPolyTestBatch : public GrTestBatch {
public:
DEFINE_BATCH_CLASS_ID
struct Geometry : public GrTestBatch::Geometry {
robertphillips 2016/01/12 20:56:33 Why do we need fRect ?
+ SkRect fRect;
SkRect fBounds;
};
@@ -48,6 +50,7 @@ private:
// Make sure any artifacts around the exterior of path are visible by using overly
// conservative bounding geometry.
fGeometry.fBounds.outset(5.f, 5.f);
+ fGeometry.fRect.outset(5.f, 5.f);
}
Geometry* geoData(int index) override {
@@ -69,7 +72,7 @@ private:
return;
}
- fGeometry.fBounds.toQuad(verts);
+ fGeometry.fRect.toQuad(verts);
helper.recordDraw(target);
}
@@ -159,6 +162,8 @@ protected:
return;
}
+ GrDrawContext* drawContext = context->drawContext(rt);
+
Color color(0xff000000);
Coverage coverage(Coverage::kSolid_Type);
LocalCoords localCoords(LocalCoords::kUnused_Type);
@@ -173,12 +178,6 @@ protected:
SkScalar x = 0;
for (int et = 0; et < kGrProcessorEdgeTypeCnt; ++et) {
- GrTestTarget tt;
- context->getTestTarget(&tt, rt);
- if (nullptr == tt.target()) {
- SkDEBUGFAIL("Couldn't get Gr test target.");
- return;
- }
const SkMatrix m = SkMatrix::MakeTrans(x, y);
SkPath p;
path->transform(m, &p);
@@ -197,11 +196,12 @@ protected:
ConvexPolyTestBatch::Geometry geometry;
geometry.fColor = color.fColor;
+ geometry.fRect = p.getBounds();
geometry.fBounds = p.getBounds();
SkAutoTUnref<GrDrawBatch> batch(ConvexPolyTestBatch::Create(gp, geometry));
- tt.target()->drawBatch(pipelineBuilder, batch);
+ drawContext->internal_drawBatch(&pipelineBuilder, batch);
x += SkScalarCeilToScalar(path->getBounds().width() + 10.f);
}
@@ -226,12 +226,6 @@ protected:
SkScalar x = 0;
for (int et = 0; et < kGrProcessorEdgeTypeCnt; ++et) {
- GrTestTarget tt;
- context->getTestTarget(&tt, rt);
- if (nullptr == tt.target()) {
- SkDEBUGFAIL("Couldn't get Gr test target.");
- return;
- }
SkRect rect = *iter.get();
rect.offset(x, y);
GrPrimitiveEdgeType edgeType = (GrPrimitiveEdgeType) et;
@@ -248,11 +242,13 @@ protected:
ConvexPolyTestBatch::Geometry geometry;
geometry.fColor = color.fColor;
+ geometry.fRect = rect;
geometry.fBounds = rect;
+ geometry.fBounds.sort();
SkAutoTUnref<GrDrawBatch> batch(ConvexPolyTestBatch::Create(gp, geometry));
- tt.target()->drawBatch(pipelineBuilder, batch);
+ drawContext->internal_drawBatch(&pipelineBuilder, batch);
x += SkScalarCeilToScalar(rect.width() + 10.f);
}
« no previous file with comments | « gm/beziereffects.cpp ('k') | include/gpu/GrDrawContext.h » ('j') | src/gpu/GrTest.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698