diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ReadPixelsTest.cpp | 13 | ||||
-rw-r--r-- | tests/WritePixelsTest.cpp | 26 |
2 files changed, 8 insertions, 31 deletions
diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp index df51a19a94..41ecccff35 100644 --- a/tests/ReadPixelsTest.cpp +++ b/tests/ReadPixelsTest.cpp @@ -303,7 +303,7 @@ void ReadPixelsTest(skiatest::Reporter* reporter, GrContextFactory* factory) { SkIRect::MakeLTRB(3 * DEV_W / 4, -10, DEV_W + 10, DEV_H + 10), }; - for (int dtype = 0; dtype < 3; ++dtype) { + for (int dtype = 0; dtype < 2; ++dtype) { int glCtxTypeCnt = 1; #if SK_SUPPORT_GPU if (0 != dtype) { @@ -325,16 +325,7 @@ void ReadPixelsTest(skiatest::Reporter* reporter, GrContextFactory* factory) { if (NULL == context) { continue; } - GrTextureDesc desc; - desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit; - desc.fWidth = DEV_W; - desc.fHeight = DEV_H; - desc.fConfig = kSkia8888_PM_GrPixelConfig; - desc.fOrigin = 1 == dtype ? kBottomLeft_GrSurfaceOrigin - : kTopLeft_GrSurfaceOrigin; - GrAutoScratchTexture ast(context, desc, GrContext::kExact_ScratchTexMatch); - SkAutoTUnref<GrTexture> tex(ast.detach()); - device.reset(new SkGpuDevice(context, tex)); + device.reset(new SkGpuDevice(context, SkBitmap::kARGB_8888_Config, DEV_W, DEV_H)); #else continue; #endif diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp index 83e0784305..14b2c51e9a 100644 --- a/tests/WritePixelsTest.cpp +++ b/tests/WritePixelsTest.cpp @@ -286,8 +286,7 @@ bool checkWrite(skiatest::Reporter* reporter, enum DevType { kRaster_DevType, #if SK_SUPPORT_GPU - kGpu_BottomLeft_DevType, - kGpu_TopLeft_DevType, + kGpu_DevType, #endif }; @@ -300,8 +299,7 @@ static const CanvasConfig gCanvasConfigs[] = { {kRaster_DevType, true}, {kRaster_DevType, false}, #if SK_SUPPORT_GPU && defined(SK_SCALAR_IS_FLOAT) - {kGpu_BottomLeft_DevType, true}, // row bytes has no meaning on gpu devices - {kGpu_TopLeft_DevType, true}, // row bytes has no meaning on gpu devices + {kGpu_DevType, true}, // row bytes has no meaning on gpu devices #endif }; @@ -323,18 +321,8 @@ SkDevice* createDevice(const CanvasConfig& c, GrContext* grCtx) { return new SkDevice(bmp); } #if SK_SUPPORT_GPU - case kGpu_BottomLeft_DevType: - case kGpu_TopLeft_DevType: - GrTextureDesc desc; - desc.fFlags = kRenderTarget_GrTextureFlagBit; - desc.fWidth = DEV_W; - desc.fHeight = DEV_H; - desc.fConfig = kSkia8888_PM_GrPixelConfig; - desc.fOrigin = kGpu_TopLeft_DevType == c.fDevType ? - kTopLeft_GrSurfaceOrigin : kBottomLeft_GrSurfaceOrigin; - GrAutoScratchTexture ast(grCtx, desc, GrContext::kExact_ScratchTexMatch); - SkAutoTUnref<GrTexture> tex(ast.detach()); - return new SkGpuDevice(grCtx, tex); + case kGpu_DevType: + return new SkGpuDevice(grCtx, SkBitmap::kARGB_8888_Config, DEV_W, DEV_H); #endif } return NULL; @@ -413,16 +401,14 @@ void WritePixelsTest(skiatest::Reporter* reporter, GrContextFactory* factory) { for (size_t i = 0; i < SK_ARRAY_COUNT(gCanvasConfigs); ++i) { int glCtxTypeCnt = 1; #if SK_SUPPORT_GPU - bool isGPUDevice = kGpu_TopLeft_DevType == gCanvasConfigs[i].fDevType || - kGpu_BottomLeft_DevType == gCanvasConfigs[i].fDevType; - if (isGPUDevice) { + if (kGpu_DevType == gCanvasConfigs[i].fDevType) { glCtxTypeCnt = GrContextFactory::kGLContextTypeCnt; } #endif for (int glCtxType = 0; glCtxType < glCtxTypeCnt; ++glCtxType) { GrContext* context = NULL; #if SK_SUPPORT_GPU - if (isGPUDevice) { + if (kGpu_DevType == gCanvasConfigs[i].fDevType) { GrContextFactory::GLContextType type = static_cast<GrContextFactory::GLContextType>(glCtxType); #if SK_ANGLE // This test breaks ANGLE with GL errors in texsubimage2D. Disable until debugged. |