diff options
| -rw-r--r-- | tests/GpuDrawPathTest.cpp | 20 | ||||
| -rw-r--r-- | tests/ResourceCacheTest.cpp | 11 |
2 files changed, 10 insertions, 21 deletions
diff --git a/tests/GpuDrawPathTest.cpp b/tests/GpuDrawPathTest.cpp index 98313aabaa..f0148ba9a2 100644 --- a/tests/GpuDrawPathTest.cpp +++ b/tests/GpuDrawPathTest.cpp @@ -12,10 +12,10 @@ #include "SkBitmap.h" #include "SkCanvas.h" #include "SkColor.h" -#include "SkGpuDevice.h" #include "SkPaint.h" #include "SkRRect.h" #include "SkRect.h" +#include "SkSurface.h" #include "Test.h" static void test_drawPathEmpty(skiatest::Reporter*, SkCanvas* canvas) { @@ -54,20 +54,10 @@ DEF_GPUTEST(GpuDrawPath, reporter, factory) { static const int sampleCounts[] = { 0, 4, 16 }; for (size_t i = 0; i < SK_ARRAY_COUNT(sampleCounts); ++i) { - const int W = 255; - const int H = 255; - - GrTextureDesc desc; - desc.fConfig = kSkia8888_GrPixelConfig; - desc.fFlags = kRenderTarget_GrTextureFlagBit; - desc.fWidth = W; - desc.fHeight = H; - desc.fSampleCnt = sampleCounts[i]; - SkAutoTUnref<GrTexture> texture(grContext->createUncachedTexture(desc, NULL, 0)); - SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(texture.get())); - SkCanvas drawingCanvas(device.get()); - - test_drawPathEmpty(reporter, &drawingCanvas); + SkImageInfo info = SkImageInfo::MakeN32Premul(255, 255); + + SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(grContext, info, sampleCounts[i])); + test_drawPathEmpty(reporter, surface->getCanvas()); } } } diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp index a66b0360eb..9a4a129c7f 100644 --- a/tests/ResourceCacheTest.cpp +++ b/tests/ResourceCacheTest.cpp @@ -7,9 +7,10 @@ #if SK_SUPPORT_GPU +#include "SkCanvas.h" #include "GrContextFactory.h" #include "GrResourceCache.h" -#include "SkGpuDevice.h" +#include "SkSurface.h" #include "Test.h" static const int gWidth = 640; @@ -296,12 +297,10 @@ DEF_GPUTEST(ResourceCache, reporter, factory) { desc.fFlags = kRenderTarget_GrTextureFlagBit; desc.fWidth = gWidth; desc.fHeight = gHeight; + SkImageInfo info = SkImageInfo::MakeN32Premul(gWidth, gHeight); + SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(context, info, 0)); - SkAutoTUnref<GrTexture> texture(context->createUncachedTexture(desc, NULL, 0)); - SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(texture.get())); - SkCanvas canvas(device.get()); - - test_cache(reporter, context, &canvas); + test_cache(reporter, context, surface->getCanvas()); test_purge_invalidated(reporter, context); test_cache_delete_on_destruction(reporter, context); test_resource_size_changed(reporter, context); |