From b6c5e5b956af9777349a6ab362ce86e430e59765 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Mon, 9 Oct 2017 16:13:02 -0400 Subject: DM: move skiatest functions into separate file. Motivation: allows reuse. Change-Id: I5732305a213acd83de4ba4e84e0ae27d094cf649 Reviewed-on: https://skia-review.googlesource.com/57241 Reviewed-by: Brian Salomon Commit-Queue: Hal Canary --- dm/DM.cpp | 65 --------------------------------------------------------------- 1 file changed, 65 deletions(-) (limited to 'dm/DM.cpp') diff --git a/dm/DM.cpp b/dm/DM.cpp index ea8ec2742e..6b76a92a1e 100644 --- a/dm/DM.cpp +++ b/dm/DM.cpp @@ -1438,68 +1438,3 @@ int main(int argc, char** argv) { return 0; } - -// TODO: currently many GPU tests are declared outside SK_SUPPORT_GPU guards. -// Thus we export the empty RunWithGPUTestContexts when SK_SUPPORT_GPU=0. -namespace skiatest { - -#if SK_SUPPORT_GPU -bool IsGLContextType(sk_gpu_test::GrContextFactory::ContextType type) { - return kOpenGL_GrBackend == GrContextFactory::ContextTypeBackend(type); -} -bool IsVulkanContextType(sk_gpu_test::GrContextFactory::ContextType type) { - return kVulkan_GrBackend == GrContextFactory::ContextTypeBackend(type); -} -bool IsRenderingGLContextType(sk_gpu_test::GrContextFactory::ContextType type) { - return IsGLContextType(type) && GrContextFactory::IsRenderingContext(type); -} -bool IsNullGLContextType(sk_gpu_test::GrContextFactory::ContextType type) { - return type == GrContextFactory::kNullGL_ContextType; -} -#else -bool IsGLContextType(int) { return false; } -bool IsVulkanContextType(int) { return false; } -bool IsRenderingGLContextType(int) { return false; } -bool IsNullGLContextType(int) { return false; } -#endif - -void RunWithGPUTestContexts(GrContextTestFn* test, GrContextTypeFilterFn* contextTypeFilter, - Reporter* reporter, GrContextFactory* factory) { -#if SK_SUPPORT_GPU - -#if defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_WIN) || defined(SK_BUILD_FOR_MAC) - static constexpr auto kNativeGLType = GrContextFactory::kGL_ContextType; -#else - static constexpr auto kNativeGLType = GrContextFactory::kGLES_ContextType; -#endif - - for (int typeInt = 0; typeInt < GrContextFactory::kContextTypeCnt; ++typeInt) { - GrContextFactory::ContextType contextType = (GrContextFactory::ContextType) typeInt; - // Use "native" instead of explicitly trying OpenGL and OpenGL ES. Do not use GLES on - // desktop since tests do not account for not fixing http://skbug.com/2809 - if (contextType == GrContextFactory::kGL_ContextType || - contextType == GrContextFactory::kGLES_ContextType) { - if (contextType != kNativeGLType) { - continue; - } - } - ContextInfo ctxInfo = factory->getContextInfo(contextType, - GrContextFactory::ContextOverrides::kDisableNVPR); - if (contextTypeFilter && !(*contextTypeFilter)(contextType)) { - continue; - } - ReporterContext ctx(reporter, SkString(GrContextFactory::ContextTypeName(contextType))); - if (ctxInfo.grContext()) { - (*test)(reporter, ctxInfo); - ctxInfo.grContext()->flush(); - } - ctxInfo = factory->getContextInfo(contextType, - GrContextFactory::ContextOverrides::kRequireNVPRSupport); - if (ctxInfo.grContext()) { - (*test)(reporter, ctxInfo); - ctxInfo.grContext()->flush(); - } - } -#endif -} -} // namespace skiatest -- cgit v1.2.3