commit 8b1fb741f196b78479b9d5bb2b33875aaa9709bb
author Brian Salomon <bsalomon@google.com> Thu Nov 03 15:21:06 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Nov 03 19:51:26 2016 +0000
tree a75f047de76812a3433a81d32386bc93c4a3d3c3
parent 12e8dc256dc521c3b1f465726b99fbce3b95728c

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>

tests/ReadPixelsTest.cpp

diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index 5fa7dd1..1550c6d 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -472,18 +472,18 @@
 }
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ReadPixels_Texture, reporter, ctxInfo) {
     // On the GPU we will also try reading back from a non-renderable texture.
-    for (auto& origin : {kBottomLeft_GrSurfaceOrigin, kTopLeft_GrSurfaceOrigin}) {
-        SkAutoTUnref<GrTexture> texture;
-        GrSurfaceDesc desc;
-        desc.fFlags = kRenderTarget_GrSurfaceFlag;
-        desc.fWidth = DEV_W;
-        desc.fHeight = DEV_H;
-        desc.fConfig = kSkia8888_GrPixelConfig;
-        desc.fOrigin = origin;
-        desc.fFlags = kNone_GrSurfaceFlags;
-        texture.reset(ctxInfo.grContext()->textureProvider()->createTexture(desc,
-                                                                            SkBudgeted::kNo));
-        test_readpixels_texture(reporter, texture);
+    for (auto origin : {kBottomLeft_GrSurfaceOrigin, kTopLeft_GrSurfaceOrigin}) {
+        for (auto flags : {kNone_GrSurfaceFlags, kRenderTarget_GrSurfaceFlag}) {
+            GrSurfaceDesc desc;
+            desc.fFlags = flags;
+            desc.fWidth = DEV_W;
+            desc.fHeight = DEV_H;
+            desc.fConfig = kSkia8888_GrPixelConfig;
+            desc.fOrigin = origin;
+            sk_sp<GrTexture> texture(ctxInfo.grContext()->textureProvider()->createTexture(desc,
+                SkBudgeted::kNo));
+            test_readpixels_texture(reporter, texture.get());
+        }
     }
 }
 #endif

tests/RectangleTextureTest.cpp

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,