diff options
| author |  bsalomon <bsalomon@google.com> | 2016-04-11 14:21:33 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-11 14:21:33 -0700 |
| commit | dc0fcd41e75682a8bfd5e285d684461475226330 (patch) | |
| tree | a88c9ae58427a3d3afbd3bfb9705db49cb9fa298 /dm | |
| parent | 849b175c029bcb5d4abb7fdadc45e8ed36f29a78 (diff) | |
Vulkan config in dm
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1872283003
Review URL: https://codereview.chromium.org/1872283003
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DM.cpp | 5 | ||||
| -rw-r--r-- | dm/DMGpuSupport.h | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -1347,7 +1347,6 @@ int dm_main() { } gather_sinks(); gather_tests(); - gPending = gSrcs.count() * gSinks.count() + gParallelTests.count() + gSerialTests.count(); info("%d srcs * %d sinks + %d tests == %d tasks", gSrcs.count(), gSinks.count(), gParallelTests.count() + gSerialTests.count(), gPending); @@ -1420,6 +1419,9 @@ namespace skiatest { 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); } @@ -1428,6 +1430,7 @@ bool IsNullGLContextType(sk_gpu_test::GrContextFactory::ContextType type) { } #else bool IsGLContextType(int) { return false; } +bool IsVulkanContextType(int) { return false; } bool IsRenderingGLContextType(int) { return false; } bool IsNullGLContextType(int) { return false; } #endif diff --git a/dm/DMGpuSupport.h b/dm/DMGpuSupport.h index 42c5eb30ae..173befd070 100644 --- a/dm/DMGpuSupport.h +++ b/dm/DMGpuSupport.h @@ -80,7 +80,8 @@ public: kNativeGL_ContextType = 0, kGL_ContextType = 0, kGLES_ContextType = 0, - kNullGL_ContextType = 0; + kNullGL_ContextType = 0, + kVulkan_ContextType = 0; static const int kContextTypeCnt = 1; enum ContextOptions { kNone_ContextOptions = 0, |