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

Unified Diff: tests/ImageFilterTest.cpp

Issue 1448873002: Generate list of GPU contexts outside tests (Closed) Base URL: https://skia.googlesource.com/skia.git@commandbuffer-as-api-01-gpu-test-context-support
Patch Set: rebase, remove a hunk Created 5 years, 1 month 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: tests/ImageFilterTest.cpp
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 012b1a98624ff146c0ff1000d2c0f87e8816d1d8..6f4f36ca565736c0c90bde1da3be618b35c2581c 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -38,7 +38,7 @@
#include "Test.h"
#if SK_SUPPORT_GPU
-#include "GrContextFactory.h"
+#include "GrContext.h"
#include "SkGpuDevice.h"
#endif
@@ -1238,11 +1238,7 @@ DEF_TEST(ImageFilterImageSourceSerialization, reporter) {
#if SK_SUPPORT_GPU
-DEF_GPUTEST(ImageFilterCropRectGPU, reporter, factory) {
- GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0));
- if (nullptr == context) {
- return;
- }
+DEF_GPUTEST_FOR_NATIVE_CONTEXT(ImageFilterCropRect_Gpu, reporter, context) {
const SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
@@ -1256,11 +1252,7 @@ DEF_GPUTEST(ImageFilterCropRectGPU, reporter, factory) {
test_crop_rects(&proxy, reporter);
}
-DEF_GPUTEST(HugeBlurImageFilterGPU, reporter, factory) {
- GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0));
- if (nullptr == context) {
- return;
- }
+DEF_GPUTEST_FOR_NATIVE_CONTEXT(HugeBlurImageFilter_Gpu, reporter, context) {
const SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
@@ -1274,11 +1266,7 @@ DEF_GPUTEST(HugeBlurImageFilterGPU, reporter, factory) {
test_huge_blur(&canvas, reporter);
}
-DEF_GPUTEST(XfermodeImageFilterCroppedInputGPU, reporter, factory) {
- GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0));
- if (nullptr == context) {
- return;
- }
+DEF_GPUTEST_FOR_NATIVE_CONTEXT(XfermodeImageFilterCroppedInput_Gpu, reporter, context) {
const SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
@@ -1292,11 +1280,7 @@ DEF_GPUTEST(XfermodeImageFilterCroppedInputGPU, reporter, factory) {
test_xfermode_cropped_input(&canvas, reporter);
}
-DEF_GPUTEST(TestNegativeBlurSigmaGPU, reporter, factory) {
- GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0));
- if (nullptr == context) {
- return;
- }
+DEF_GPUTEST_FOR_NATIVE_CONTEXT(TestNegativeBlurSigma_Gpu, reporter, context) {
const SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,

Powered by Google App Engine
This is Rietveld 408576698