Generate list of GPU contexts outside tests
Use DEF_GPUTEST_FOR_*_CONTEXT macros to obtain the
test GPU context.
Makes changing the context -related classes easier,
since not all tests need to be changed.
BUG=skia:2992
Review URL: https://codereview.chromium.org/1448873002
diff --git a/tests/ImageNewShaderTest.cpp b/tests/ImageNewShaderTest.cpp
index c01fbe7..2c25b90 100644
--- a/tests/ImageNewShaderTest.cpp
+++ b/tests/ImageNewShaderTest.cpp
@@ -5,17 +5,17 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
-#if SK_SUPPORT_GPU
-#include "GrContextFactory.h"
-#endif
#include "SkCanvas.h"
#include "SkImage.h"
#include "SkShader.h"
#include "SkSurface.h"
-
+#include "SkTypes.h"
#include "Test.h"
+#if SK_SUPPORT_GPU
+#include "GrContext.h"
+#endif
+
void testBitmapEquality(skiatest::Reporter* reporter, SkBitmap& bm1, SkBitmap& bm2) {
SkAutoLockPixels lockBm1(bm1);
SkAutoLockPixels lockBm2(bm2);
@@ -143,29 +143,15 @@
runShaderTest(reporter, sourceSurface.get(), destinationSurface.get(), info);
}
-DEF_GPUTEST(ImageNewShader_GPU, reporter, factory) {
- for (int i = 0; i < GrContextFactory::kGLContextTypeCnt; ++i) {
- GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContextType) i;
+DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageNewShader_GPU, reporter, context) {
+ // GPU -> GPU
+ gpuToGpu(reporter, context);
- if (!GrContextFactory::IsRenderingGLContext(glCtxType)) {
- continue;
- }
+ // GPU -> RASTER
+ gpuToRaster(reporter, context);
- GrContext* context = factory->get(glCtxType);
-
- if (nullptr == context) {
- continue;
- }
-
- // GPU -> GPU
- gpuToGpu(reporter, context);
-
- // GPU -> RASTER
- gpuToRaster(reporter, context);
-
- // RASTER -> GPU
- rasterToGpu(reporter, context);
- }
+ // RASTER -> GPU
+ rasterToGpu(reporter, context);
}
#endif