commit a21d196602a85c5579ef71d23bdbd4fb02e87554
author Michael Ludwig <michaelludwig@google.com> Fri Jan 11 15:26:22 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jan 14 15:27:44 2019 +0000
tree ec3fd18ea1cf8e1da11858a1a7ddcb95ea76f9ce
parent 69802c4704adaded02a5e4e0542660db9882552a

Move clear-as-draw caps into GrCaps

Bug: skia:
Change-Id: Ib029f337f5e61366e2550e77dc99310b44d03f84
Reviewed-on: https://skia-review.googlesource.com/c/182970
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>

tests/ClearTest.cpp

diff --git a/tests/ClearTest.cpp b/tests/ClearTest.cpp
index c4809f5..c9e8e54 100644
--- a/tests/ClearTest.cpp
+++ b/tests/ClearTest.cpp
@@ -225,13 +225,14 @@
 }
 
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ClearOp, reporter, ctxInfo) {
+    // Regular clear
     clear_op_test(reporter, ctxInfo.grContext());
-    if (ctxInfo.backend() == GrBackendApi::kOpenGL) {
-        GrContextOptions options(ctxInfo.options());
-        options.fUseDrawInsteadOfGLClear = GrContextOptions::Enable::kYes;
-        sk_gpu_test::GrContextFactory workaroundFactory(options);
-        clear_op_test(reporter, workaroundFactory.get(ctxInfo.type()));
-    }
+
+    // Force drawing for clears
+    GrContextOptions options(ctxInfo.options());
+    options.fUseDrawInsteadOfClear = GrContextOptions::Enable::kYes;
+    sk_gpu_test::GrContextFactory workaroundFactory(options);
+    clear_op_test(reporter, workaroundFactory.get(ctxInfo.type()));
 }
 
 void fullscreen_clear_with_layer_test(skiatest::Reporter* reporter, GrContext* context) {
@@ -290,11 +291,12 @@
 }
 // From crbug.com/768134
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(FullScreenClearWithLayers, reporter, ctxInfo) {
+    // Regular clear
     fullscreen_clear_with_layer_test(reporter, ctxInfo.grContext());
-    if (ctxInfo.backend() == GrBackendApi::kOpenGL) {
-        GrContextOptions options(ctxInfo.options());
-        options.fUseDrawInsteadOfGLClear = GrContextOptions::Enable::kYes;
-        sk_gpu_test::GrContextFactory workaroundFactory(options);
-        fullscreen_clear_with_layer_test(reporter, workaroundFactory.get(ctxInfo.type()));
-    }
+
+    // Use draws for clears
+    GrContextOptions options(ctxInfo.options());
+    options.fUseDrawInsteadOfClear = GrContextOptions::Enable::kYes;
+    sk_gpu_test::GrContextFactory workaroundFactory(options);
+    fullscreen_clear_with_layer_test(reporter, workaroundFactory.get(ctxInfo.type()));
 }