commit e795954366ad5ae2cfd8de81d7270e46a5a31ae4
author Brian Osman <brianosman@google.com> Wed Feb 10 14:29:17 2021 -0500
committer Brian Osman <brianosman@google.com> Thu Feb 18 17:40:58 2021 +0000
tree 98122b955e8f7163e473e6ca9f57222e3d05756d
parent c301cc72f3213442c5ec3edf97e1abaed0faff3d

Run the Programs unit test on all rendering backends

Change-Id: I2bf8070fccacb21d2c5de56cdd9b6b77adb6c5a1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368876
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

dm/DMGpuTestProcs.cpp

diff --git a/dm/DMGpuTestProcs.cpp b/dm/DMGpuTestProcs.cpp
index b81d56a..b6e880b 100644
--- a/dm/DMGpuTestProcs.cpp
+++ b/dm/DMGpuTestProcs.cpp
@@ -33,10 +33,6 @@
 bool IsRenderingGLContextType(sk_gpu_test::GrContextFactory::ContextType type) {
     return IsGLContextType(type) && GrContextFactory::IsRenderingContext(type);
 }
-bool IsRenderingGLOrMetalContextType(sk_gpu_test::GrContextFactory::ContextType type) {
-    return (IsGLContextType(type) || IsMetalContextType(type)) &&
-           GrContextFactory::IsRenderingContext(type);
-}
 bool IsMockContextType(sk_gpu_test::GrContextFactory::ContextType type) {
     return type == GrContextFactory::kMock_ContextType;
 }

modules/canvaskit/gm_bindings.cpp

diff --git a/modules/canvaskit/gm_bindings.cpp b/modules/canvaskit/gm_bindings.cpp
index 4aa6ad8..aa22abe 100644
--- a/modules/canvaskit/gm_bindings.cpp
+++ b/modules/canvaskit/gm_bindings.cpp
@@ -273,9 +273,6 @@
 bool IsRenderingGLContextType(ContextType ct) {
     return IsGLContextType(ct) && sk_gpu_test::GrContextFactory::IsRenderingContext(ct);
 }
-bool IsRenderingGLOrMetalContextType(ContextType ct) {
-    return IsRenderingGLContextType(ct);
-}
 bool IsMockContextType(ContextType ct) {
     return ct == ContextType::kMock_ContextType;
 }

tests/ProgramsTest.cpp

diff --git a/tests/ProgramsTest.cpp b/tests/ProgramsTest.cpp
index a569151..e3310e2 100644
--- a/tests/ProgramsTest.cpp
+++ b/tests/ProgramsTest.cpp
@@ -415,6 +415,6 @@
     GrContextOptions opts = options;
     opts.fSuppressPrints = true;
     sk_gpu_test::GrContextFactory debugFactory(opts);
-    skiatest::RunWithGPUTestContexts(test_programs, &skiatest::IsRenderingGLOrMetalContextType,
-                                     reporter, opts);
+    skiatest::RunWithGPUTestContexts(
+            test_programs, &sk_gpu_test::GrContextFactory::IsRenderingContext, reporter, opts);
 }

tests/Test.h

diff --git a/tests/Test.h b/tests/Test.h
index 117b015..0bff5f2 100644
--- a/tests/Test.h
+++ b/tests/Test.h
@@ -121,7 +121,6 @@
 extern bool IsDawnContextType(GrContextFactoryContextType);
 extern bool IsDirect3DContextType(GrContextFactoryContextType);
 extern bool IsRenderingGLContextType(GrContextFactoryContextType);
-extern bool IsRenderingGLOrMetalContextType(GrContextFactoryContextType);
 extern bool IsMockContextType(GrContextFactoryContextType);
 void RunWithGPUTestContexts(GrContextTestFn*, GrContextTypeFilterFn*, Reporter*,
                             const GrContextOptions&);