diff options
| author |  kkinnunen <kkinnunen@nvidia.com> | 2015-12-10 23:19:29 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-10 23:19:29 -0800 |
| commit | 55eeae97227fa2523207bc67523da5b9eb663536 (patch) | |
| tree | c14fff6248bf858946fbdf5f0eeddccfcd1f2ade | |
| parent | 62d3b101106602d87cad91b0ac97c10003ca33a5 (diff) | |
Run debug gl context for DEF_GPU_TEST_FOR_ALL_CONTEXTS
Run debug gl context for tests defined with
DEF_GPU_TEST_FOR_ALL_CONTEXTS.
Review URL: https://codereview.chromium.org/1514023002
| -rw-r--r-- | dm/DM.cpp | 8 | ||||
| -rw-r--r-- | tests/Test.h | 9 |
2 files changed, 10 insertions, 7 deletions
@@ -1185,12 +1185,12 @@ void RunWithGPUTestContexts(T test, GPUTestContexts testContexts, Reporter* repo int contextSelector = kNone_GPUTestContexts; if (GrContextFactory::IsRenderingGLContext(glCtxType)) { contextSelector |= kAllRendering_GPUTestContexts; - } - if (glCtxType == GrContextFactory::kNative_GLContextType) { + } else if (glCtxType == GrContextFactory::kNative_GLContextType) { contextSelector |= kNative_GPUTestContexts; - } - if (glCtxType == GrContextFactory::kNull_GLContextType) { + } else if (glCtxType == GrContextFactory::kNull_GLContextType) { contextSelector |= kNull_GPUTestContexts; + } else if (glCtxType == GrContextFactory::kDebug_GLContextType) { + contextSelector |= kDebug_GPUTestContexts; } if ((testContexts & contextSelector) == 0) { continue; diff --git a/tests/Test.h b/tests/Test.h index be2ef1f788..fb0fd1fec8 100644 --- a/tests/Test.h +++ b/tests/Test.h @@ -74,10 +74,13 @@ typedef SkTRegistry<Test> TestRegistry; enum GPUTestContexts { kNone_GPUTestContexts = 0, kNull_GPUTestContexts = 1, - kNative_GPUTestContexts = 1 << 1, - kOther_GPUTestContexts = 1 << 2, // Other than native, used only for below. + kDebug_GPUTestContexts = 1 << 1, + kNative_GPUTestContexts = 1 << 2, + kOther_GPUTestContexts = 1 << 3, // Other than native, used only for below. kAllRendering_GPUTestContexts = kNative_GPUTestContexts | kOther_GPUTestContexts, - kAll_GPUTestContexts = kAllRendering_GPUTestContexts | kNull_GPUTestContexts + kAll_GPUTestContexts = kAllRendering_GPUTestContexts + | kNull_GPUTestContexts + | kDebug_GPUTestContexts }; template<typename T> void RunWithGPUTestContexts(T testFunction, GPUTestContexts contexts, Reporter* reporter, |