aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2017-01-20 09:11:37 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-20 16:47:34 +0000
commit77505da16093695f717ad34ff100ec11ffb2835b (patch)
tree2eae3106223c6b484606d5b74f139039027a5eba /tests
parent80a08dd2e5cc379100ae944b3f3fadf887d518f0 (diff)
Remove GrTestTarget
Change-Id: I4d2e1aa54732ff75b44a197255035c0e04548219 Reviewed-on: https://skia-review.googlesource.com/7327 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/DFPathRendererTest.cpp33
-rw-r--r--tests/TessellatingPathRendererTests.cpp59
2 files changed, 45 insertions, 47 deletions
diff --git a/tests/DFPathRendererTest.cpp b/tests/DFPathRendererTest.cpp
index 7fb8c8a120..e4d87a2049 100644
--- a/tests/DFPathRendererTest.cpp
+++ b/tests/DFPathRendererTest.cpp
@@ -7,18 +7,19 @@
#include "Test.h"
+#include "SkPath.h"
+
#if SK_SUPPORT_GPU
#include "GrContext.h"
-#include "GrTest.h"
-#include "SkPath.h"
#include "ops/GrAADistanceFieldPathRenderer.h"
// This test case including path coords and matrix taken from crbug.com/627443.
// Because of inaccuracies in large floating point values this causes the
// the path renderer to attempt to add a path DF to its atlas that is larger
// than the plot size which used to crash rather than fail gracefully.
-static void test_far_from_origin(GrRenderTargetContext* renderTargetContext, GrPathRenderer* pr,
- GrResourceProvider* rp) {
+static void test_far_from_origin(GrResourceProvider* rp,
+ GrRenderTargetContext* renderTargetContext,
+ GrPathRenderer* pr) {
SkPath path;
path.lineTo(49.0255089839f, 0.473541f);
// This extra line wasn't in the original bug but was added to fake out GrShape's special
@@ -58,27 +59,25 @@ static void test_far_from_origin(GrRenderTargetContext* renderTargetContext, GrP
}
DEF_GPUTEST_FOR_ALL_GL_CONTEXTS(AADistanceFieldPathRenderer, reporter, ctxInfo) {
+ GrContext* ctx = ctxInfo.grContext();
// The DF PR only works with contexts that support derivatives
- if (!ctxInfo.grContext()->caps()->shaderCaps()->shaderDerivativeSupport()) {
+ if (!ctx->caps()->shaderCaps()->shaderDerivativeSupport()) {
return;
}
- sk_sp<GrRenderTargetContext> rtc(ctxInfo.grContext()->makeRenderTargetContext(
- SkBackingFit::kApprox,
- 800, 800,
- kRGBA_8888_GrPixelConfig,
- nullptr,
- 0,
- kTopLeft_GrSurfaceOrigin));
+ sk_sp<GrRenderTargetContext> rtc(ctx->makeRenderTargetContext(SkBackingFit::kApprox,
+ 800, 800,
+ kRGBA_8888_GrPixelConfig,
+ nullptr,
+ 0,
+ kTopLeft_GrSurfaceOrigin));
if (!rtc) {
return;
}
GrAADistanceFieldPathRenderer dfpr;
- GrTestTarget tt;
- ctxInfo.grContext()->getTestTarget(&tt, rtc);
- GrResourceProvider* rp = tt.resourceProvider();
- test_far_from_origin(rtc.get(), &dfpr, rp);
- ctxInfo.grContext()->flush();
+ ctx->flush();
+ test_far_from_origin(ctx->resourceProvider(), rtc.get(), &dfpr);
+ ctx->flush();
}
#endif
diff --git a/tests/TessellatingPathRendererTests.cpp b/tests/TessellatingPathRendererTests.cpp
index b03db18713..90d2ba5859 100644
--- a/tests/TessellatingPathRendererTests.cpp
+++ b/tests/TessellatingPathRendererTests.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
+#include "Test.h"
+
#include "SkPath.h"
#if SK_SUPPORT_GPU
#include "GrContext.h"
-#include "GrTest.h"
-#include "Test.h"
#include "ops/GrTessellatingPathRenderer.h"
/*
@@ -249,7 +249,7 @@ static SkPath create_path_16() {
return path;
}
-static void test_path(GrRenderTargetContext* renderTargetContext, GrResourceProvider* rp,
+static void test_path(GrResourceProvider* rp, GrRenderTargetContext* renderTargetContext,
const SkPath& path) {
GrTessellatingPathRenderer tess;
@@ -272,37 +272,36 @@ static void test_path(GrRenderTargetContext* renderTargetContext, GrResourceProv
}
DEF_GPUTEST_FOR_ALL_CONTEXTS(TessellatingPathRendererTests, reporter, ctxInfo) {
- sk_sp<GrRenderTargetContext> rtc(ctxInfo.grContext()->makeRenderTargetContext(
- SkBackingFit::kApprox,
- 800, 800,
- kRGBA_8888_GrPixelConfig,
- nullptr,
- 0,
- kTopLeft_GrSurfaceOrigin));
+ GrContext* ctx = ctxInfo.grContext();
+ sk_sp<GrRenderTargetContext> rtc(ctx->makeRenderTargetContext(SkBackingFit::kApprox,
+ 800, 800,
+ kRGBA_8888_GrPixelConfig,
+ nullptr,
+ 0,
+ kTopLeft_GrSurfaceOrigin));
if (!rtc) {
return;
}
- GrTestTarget tt;
- ctxInfo.grContext()->getTestTarget(&tt, rtc);
- GrResourceProvider* rp = tt.resourceProvider();
+ GrResourceProvider* rp = ctx->resourceProvider();
- test_path(rtc.get(), rp, create_path_0());
- test_path(rtc.get(), rp, create_path_1());
- test_path(rtc.get(), rp, create_path_2());
- test_path(rtc.get(), rp, create_path_3());
- test_path(rtc.get(), rp, create_path_4());
- test_path(rtc.get(), rp, create_path_5());
- test_path(rtc.get(), rp, create_path_6());
- test_path(rtc.get(), rp, create_path_7());
- test_path(rtc.get(), rp, create_path_8());
- test_path(rtc.get(), rp, create_path_9());
- test_path(rtc.get(), rp, create_path_10());
- test_path(rtc.get(), rp, create_path_11());
- test_path(rtc.get(), rp, create_path_12());
- test_path(rtc.get(), rp, create_path_13());
- test_path(rtc.get(), rp, create_path_14());
- test_path(rtc.get(), rp, create_path_15());
- test_path(rtc.get(), rp, create_path_16());
+ ctx->flush();
+ test_path(rp, rtc.get(), create_path_0());
+ test_path(rp, rtc.get(), create_path_1());
+ test_path(rp, rtc.get(), create_path_2());
+ test_path(rp, rtc.get(), create_path_3());
+ test_path(rp, rtc.get(), create_path_4());
+ test_path(rp, rtc.get(), create_path_5());
+ test_path(rp, rtc.get(), create_path_6());
+ test_path(rp, rtc.get(), create_path_7());
+ test_path(rp, rtc.get(), create_path_8());
+ test_path(rp, rtc.get(), create_path_9());
+ test_path(rp, rtc.get(), create_path_10());
+ test_path(rp, rtc.get(), create_path_11());
+ test_path(rp, rtc.get(), create_path_12());
+ test_path(rp, rtc.get(), create_path_13());
+ test_path(rp, rtc.get(), create_path_14());
+ test_path(rp, rtc.get(), create_path_15());
+ test_path(rp, rtc.get(), create_path_16());
}
#endif