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
This commit is contained in:
kkinnunen 2015-12-10 23:19:29 -08:00 committed by Commit bot
parent 62d3b10110
commit 55eeae9722
2 changed files with 10 additions and 7 deletions

View File

@ -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;

View File

@ -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,