commit 7128fdd82d7c4bd5e17dd5a2ebb6135904335746
author Brian Salomon <bsalomon@google.com> Mon May 22 14:00:07 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon May 22 18:50:58 2017 +0000
tree 91dadcaef1c6ba0cce3a913ab18a7d318405f2b7
parent 112565e3e7e0403a2a1bf1db9a42134a5cd6ed85

Remove kZeroCopy_GrSurfaceFlag

Change-Id: I2869f97a14f3a1363ebfef5d657bd6468fc991f7
Reviewed-on: https://skia-review.googlesource.com/17491
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

tests/VkUploadPixelsTests.cpp

diff --git a/tests/VkUploadPixelsTests.cpp b/tests/VkUploadPixelsTests.cpp
index 417457e..7f5001c 100644
--- a/tests/VkUploadPixelsTests.cpp
+++ b/tests/VkUploadPixelsTests.cpp
@@ -52,7 +52,7 @@
 }
 
 void basic_texture_test(skiatest::Reporter* reporter, GrContext* context, GrPixelConfig config,
-                        bool renderTarget, bool linearTiling) {
+                        bool renderTarget) {
     const int kWidth = 16;
     const int kHeight = 16;
     SkAutoTMalloc<GrColor> srcBuffer(kWidth*kHeight);
@@ -60,23 +60,8 @@
 
     fill_pixel_data(kWidth, kHeight, srcBuffer.get());
 
-    const GrVkCaps* caps = reinterpret_cast<const GrVkCaps*>(context->caps());
-
-    bool canCreate = true;
-    // the expectation is that the given config is texturable/renderable with optimal tiling
-    // but may not be with linear tiling
-    if (linearTiling) {
-        if (!caps->isConfigTexturableLinearly(config) ||
-            (renderTarget && !caps->isConfigRenderableLinearly(config, false))) {
-            canCreate = false;
-        }
-    }
-
     GrSurfaceDesc surfDesc;
     surfDesc.fFlags = renderTarget ? kRenderTarget_GrSurfaceFlag : kNone_GrSurfaceFlags;
-    if (linearTiling) {
-        surfDesc.fFlags |= kZeroCopy_GrSurfaceFlag;
-    }
     surfDesc.fOrigin = kTopLeft_GrSurfaceOrigin;
     surfDesc.fWidth = kWidth;
     surfDesc.fHeight = kHeight;
@@ -89,10 +74,8 @@
     sk_sp<GrTextureProxy> proxy = GrSurfaceProxy::MakeDeferred(context->resourceProvider(),
                                                                surfDesc, SkBudgeted::kNo,
                                                                srcBuffer, 0);
-
+    REPORTER_ASSERT(reporter, proxy);
     if (proxy) {
-        REPORTER_ASSERT(reporter, canCreate);
-
         sk_sp<GrSurfaceContext> sContext = context->contextPriv().makeWrappedSurfaceContext(
                                                                                 proxy, nullptr);
 
@@ -118,8 +101,6 @@
                                                                          dstBuffer,
                                                                          10,
                                                                          2));
-    } else {
-        REPORTER_ASSERT(reporter, !canCreate);
     }
 
     surfDesc.fOrigin = kBottomLeft_GrSurfaceOrigin;
@@ -127,9 +108,8 @@
     proxy = GrSurfaceProxy::MakeDeferred(context->resourceProvider(),
                                          surfDesc, SkBudgeted::kNo,
                                          srcBuffer, 0);
+    REPORTER_ASSERT(reporter, proxy);
     if (proxy) {
-        REPORTER_ASSERT(reporter, canCreate);
-
         sk_sp<GrSurfaceContext> sContext = context->contextPriv().makeWrappedSurfaceContext(
                                                                                 proxy, nullptr);
 
@@ -156,23 +136,17 @@
                                                                          4,
                                                                          5));
 
-    } else {
-        REPORTER_ASSERT(reporter, !canCreate);
     }
 }
 
 DEF_GPUTEST_FOR_VULKAN_CONTEXT(VkUploadPixelsTests, reporter, ctxInfo) {
     // RGBA
-    basic_texture_test(reporter, ctxInfo.grContext(), kRGBA_8888_GrPixelConfig, false, false);
-    basic_texture_test(reporter, ctxInfo.grContext(), kRGBA_8888_GrPixelConfig, true, false);
-    basic_texture_test(reporter, ctxInfo.grContext(), kRGBA_8888_GrPixelConfig, false, true);
-    basic_texture_test(reporter, ctxInfo.grContext(), kRGBA_8888_GrPixelConfig, true, true);
+    basic_texture_test(reporter, ctxInfo.grContext(), kRGBA_8888_GrPixelConfig, false);
+    basic_texture_test(reporter, ctxInfo.grContext(), kRGBA_8888_GrPixelConfig, true);
 
     // BGRA
-    basic_texture_test(reporter, ctxInfo.grContext(), kBGRA_8888_GrPixelConfig, false, false);
-    basic_texture_test(reporter, ctxInfo.grContext(), kBGRA_8888_GrPixelConfig, true, false);
-    basic_texture_test(reporter, ctxInfo.grContext(), kBGRA_8888_GrPixelConfig, false, true);
-    basic_texture_test(reporter, ctxInfo.grContext(), kBGRA_8888_GrPixelConfig, true, true);
+    basic_texture_test(reporter, ctxInfo.grContext(), kBGRA_8888_GrPixelConfig, false);
+    basic_texture_test(reporter, ctxInfo.grContext(), kBGRA_8888_GrPixelConfig, true);
 }
 
 #endif