Make more tests exercise rendertargetless textures.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4322
Change-Id: I442041cd5d74768f0981eedcc17be7256e0e0b37
Reviewed-on: https://skia-review.googlesource.com/4322
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp
index 8bdcbb3..08311e4 100644
--- a/tests/RectangleTextureTest.cpp
+++ b/tests/RectangleTextureTest.cpp
@@ -54,15 +54,17 @@
static void test_copy_surface_src(skiatest::Reporter* reporter, GrContext* context,
GrTexture* rectangleTexture, uint32_t expectedPixelValues[]) {
- GrSurfaceDesc copyDstDesc;
- copyDstDesc.fConfig = kRGBA_8888_GrPixelConfig;
- copyDstDesc.fWidth = rectangleTexture->width();
- copyDstDesc.fHeight = rectangleTexture->height();
- copyDstDesc.fFlags = kRenderTarget_GrSurfaceFlag;
- SkAutoTUnref<GrTexture> dst(context->textureProvider()->createTexture(
- copyDstDesc, SkBudgeted::kYes));
- context->copySurface(dst, rectangleTexture);
- test_read_pixels(reporter, context, dst, expectedPixelValues);
+ for (auto flags : {kNone_GrSurfaceFlags, kRenderTarget_GrSurfaceFlag}) {
+ GrSurfaceDesc copyDstDesc;
+ copyDstDesc.fConfig = kRGBA_8888_GrPixelConfig;
+ copyDstDesc.fWidth = rectangleTexture->width();
+ copyDstDesc.fHeight = rectangleTexture->height();
+ copyDstDesc.fFlags = flags;
+ SkAutoTUnref<GrTexture> dst(context->textureProvider()->createTexture(
+ copyDstDesc, SkBudgeted::kYes));
+ context->copySurface(dst, rectangleTexture);
+ test_read_pixels(reporter, context, dst, expectedPixelValues);
+ }
}
static void test_copy_surface_dst(skiatest::Reporter* reporter, GrContext* context,
@@ -74,17 +76,18 @@
pixels.get()[y * rectangleTexture->width() + x] = GrColorPackRGBA(y, x, x * y, x *+ y);
}
}
+ for (auto flags : {kNone_GrSurfaceFlags, kRenderTarget_GrSurfaceFlag}) {
+ GrSurfaceDesc copySrcDesc;
+ copySrcDesc.fConfig = kRGBA_8888_GrPixelConfig;
+ copySrcDesc.fWidth = rectangleTexture->width();
+ copySrcDesc.fHeight = rectangleTexture->height();
+ copySrcDesc.fFlags = flags;
+ SkAutoTUnref<GrTexture> src(context->textureProvider()->createTexture(
+ copySrcDesc, SkBudgeted::kYes, pixels.get(), 0));
- GrSurfaceDesc copySrcDesc;
- copySrcDesc.fConfig = kRGBA_8888_GrPixelConfig;
- copySrcDesc.fWidth = rectangleTexture->width();
- copySrcDesc.fHeight = rectangleTexture->height();
- copySrcDesc.fFlags = kRenderTarget_GrSurfaceFlag;
- SkAutoTUnref<GrTexture> src(context->textureProvider()->createTexture(
- copySrcDesc, SkBudgeted::kYes, pixels.get(), 0));
-
- context->copySurface(rectangleTexture, src);
- test_read_pixels(reporter, context, rectangleTexture, pixels.get());
+ context->copySurface(rectangleTexture, src);
+ test_read_pixels(reporter, context, rectangleTexture, pixels.get());
+ }
}
static void test_clear(skiatest::Reporter* reporter, GrContext* context,