| Index: tests/ImageFilterTest.cpp
|
| diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
|
| index 58dc1a7161a0093b8c46913dc0f347a6e6ba80ba..49455c9481629453cc344a6b324573127697adcc 100644
|
| --- a/tests/ImageFilterTest.cpp
|
| +++ b/tests/ImageFilterTest.cpp
|
| @@ -652,7 +652,7 @@ DEF_TEST(TestNegativeBlurSigma, reporter) {
|
| }
|
|
|
| #if SK_SUPPORT_GPU
|
| -DEF_GPUTEST_FOR_NATIVE_CONTEXT(TestNegativeBlurSigma_Gpu, reporter, context) {
|
| +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(TestNegativeBlurSigma_Gpu, reporter, context) {
|
| run_gpu_test(reporter, context, 100, test_negative_blur_sigma);
|
| }
|
| #endif
|
| @@ -698,7 +698,7 @@ DEF_TEST(TestZeroBlurSigma, reporter) {
|
| }
|
|
|
| #if SK_SUPPORT_GPU
|
| -DEF_GPUTEST_FOR_NATIVE_CONTEXT(TestZeroBlurSigma_Gpu, reporter, context) {
|
| +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(TestZeroBlurSigma_Gpu, reporter, context) {
|
| run_gpu_test(reporter, context, 100, test_zero_blur_sigma);
|
| }
|
| #endif
|
| @@ -732,7 +732,7 @@ DEF_TEST(ImageFilterFailAffectsTransparentBlack, reporter) {
|
| }
|
|
|
| #if SK_SUPPORT_GPU
|
| -DEF_GPUTEST_FOR_NATIVE_CONTEXT(ImageFilterFailAffectsTransparentBlack_Gpu, reporter, context) {
|
| +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterFailAffectsTransparentBlack_Gpu, reporter, context) {
|
| run_gpu_test(reporter, context, 100, test_fail_affects_transparent_black);
|
| }
|
| #endif
|
| @@ -946,7 +946,7 @@ DEF_TEST(ImageFilterMergeResultSize, reporter) {
|
| }
|
|
|
| #if SK_SUPPORT_GPU
|
| -DEF_GPUTEST_FOR_NATIVE_CONTEXT(ImageFilterMergeResultSize_Gpu, reporter, context) {
|
| +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterMergeResultSize_Gpu, reporter, context) {
|
| run_gpu_test(reporter, context, 100, test_imagefilter_merge_result_size);
|
| }
|
| #endif
|
| @@ -1081,7 +1081,7 @@ DEF_TEST(ImageFilterCropRect, reporter) {
|
| }
|
|
|
| #if SK_SUPPORT_GPU
|
| -DEF_GPUTEST_FOR_NATIVE_CONTEXT(ImageFilterCropRect_Gpu, reporter, context) {
|
| +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterCropRect_Gpu, reporter, context) {
|
| run_gpu_test(reporter, context, 100, test_crop_rects);
|
| }
|
| #endif
|
| @@ -1204,7 +1204,7 @@ DEF_TEST(ImageFilterClippedPictureImageFilter, reporter) {
|
| }
|
|
|
| #if SK_SUPPORT_GPU
|
| -DEF_GPUTEST_FOR_NATIVE_CONTEXT(ImageFilterClippedPictureImageFilter_Gpu, reporter, context) {
|
| +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterClippedPictureImageFilter_Gpu, reporter, context) {
|
| run_gpu_test(reporter, context, 2, test_clipped_picture_imagefilter);
|
| }
|
| #endif
|
| @@ -1456,7 +1456,7 @@ DEF_TEST(ComposedImageFilterOffset, reporter) {
|
| }
|
|
|
| #if SK_SUPPORT_GPU
|
| -DEF_GPUTEST_FOR_NATIVE_CONTEXT(ComposedImageFilterOffset_Gpu, reporter, context) {
|
| +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ComposedImageFilterOffset_Gpu, reporter, context) {
|
| run_gpu_test(reporter, context, 100, test_composed_imagefilter_offset);
|
| }
|
| #endif
|
| @@ -1500,7 +1500,7 @@ DEF_TEST(ComposedImageFilterBounds, reporter) {
|
| }
|
|
|
| #if SK_SUPPORT_GPU
|
| -DEF_GPUTEST_FOR_NATIVE_CONTEXT(ComposedImageFilterBounds_Gpu, reporter, context) {
|
| +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ComposedImageFilterBounds_Gpu, reporter, context) {
|
| run_gpu_test(reporter, context, 100, test_composed_imagefilter_bounds);
|
| }
|
| #endif
|
| @@ -1530,7 +1530,7 @@ DEF_TEST(PartialCropRect, reporter) {
|
| }
|
|
|
| #if SK_SUPPORT_GPU
|
| -DEF_GPUTEST_FOR_NATIVE_CONTEXT(PartialCropRect_Gpu, reporter, context) {
|
| +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(PartialCropRect_Gpu, reporter, context) {
|
| run_gpu_test(reporter, context, 100, test_partial_crop_rect);
|
| }
|
| #endif
|
| @@ -1666,7 +1666,7 @@ DEF_TEST(BlurLargeImage, reporter) {
|
|
|
| #if SK_SUPPORT_GPU
|
|
|
| -DEF_GPUTEST_FOR_NATIVE_CONTEXT(HugeBlurImageFilter_Gpu, reporter, context) {
|
| +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(HugeBlurImageFilter_Gpu, reporter, context) {
|
| const SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
|
|
|
| SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
|
| @@ -1680,7 +1680,7 @@ DEF_GPUTEST_FOR_NATIVE_CONTEXT(HugeBlurImageFilter_Gpu, reporter, context) {
|
| test_huge_blur(&canvas, reporter);
|
| }
|
|
|
| -DEF_GPUTEST_FOR_NATIVE_CONTEXT(XfermodeImageFilterCroppedInput_Gpu, reporter, context) {
|
| +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(XfermodeImageFilterCroppedInput_Gpu, reporter, context) {
|
| const SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
|
|
|
| SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
|
|
|