diff options
author | bsalomon <bsalomon@google.com> | 2016-04-05 07:26:28 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-05 07:26:29 -0700 |
commit | 3b597388b35967a751fb055d0b8fcc30b443b5a8 (patch) | |
tree | c6de64314d519cd89589901b8691945848049fee /tests | |
parent | 17b892551465e5a44560a06e4b34dc3592b49622 (diff) |
Revert of Add predfined configs for msaa4, nvpr4, nvpr4dit, and srgb that explictly use OpenGL rather than GL… (patchset #3 id:40001 of https://codereview.chromium.org/1853103003/ )
Reason for revert:
causing crashes on win8 bot?
Original issue's description:
> Add predfined configs for msaa4, nvpr4, nvpr4dit, and srgb that explictly use OpenGL rather than GLES and use them on the X1 bot
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1853103003
>
> Committed: https://skia.googlesource.com/skia/+/74cb44dee50b5db94c1374cbcf0b0a1babd09d89
TBR=egdaniel@google.com,jvanverth@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1857233002
Diffstat (limited to 'tests')
-rw-r--r-- | tests/TestConfigParsing.cpp | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/tests/TestConfigParsing.cpp b/tests/TestConfigParsing.cpp index 301f6a2d9a..f718994b56 100644 --- a/tests/TestConfigParsing.cpp +++ b/tests/TestConfigParsing.cpp @@ -58,16 +58,10 @@ DEF_TEST(ParseConfigs_OutParam, reporter) { ParseConfigs(config1, &configs); REPORTER_ASSERT(reporter, configs.count() == 1); REPORTER_ASSERT(reporter, configs[0]->getTag().equals("gpu")); - SkCommandLineFlags::StringArray config2 = make_string_array({"8888"}); ParseConfigs(config2, &configs); REPORTER_ASSERT(reporter, configs.count() == 1); REPORTER_ASSERT(reporter, configs[0]->getTag().equals("8888")); - - SkCommandLineFlags::StringArray config3 = make_string_array({"gl"}); - ParseConfigs(config3, &configs); - REPORTER_ASSERT(reporter, configs.count() == 1); - REPORTER_ASSERT(reporter, configs[0]->getTag().equals("gl")); } DEF_TEST(ParseConfigs_DefaultConfigs, reporter) { @@ -77,7 +71,7 @@ DEF_TEST(ParseConfigs_DefaultConfigs, reporter) { "565", "8888", "debug", "gpu", "gpudebug", "gpudft", "gpunull", "msaa16", "msaa4", "nonrendering", "null", "nullgpu", "nvpr16", "nvpr4", "nvprdit16", "nvprdit4", "pdf", "skp", "svg", "xps", "angle", "angle-gl", "commandbuffer", "mesa", "hwui", - "gpuf16", "gpusrgb", "gl", "glnvpr4", "glnvprdit4", "glsrgb", "glmsaa4" + "gpuf16", "gpusrgb" }); SkCommandLineConfigArray configs; @@ -147,20 +141,6 @@ DEF_TEST(ParseConfigs_DefaultConfigs, reporter) { #else REPORTER_ASSERT(reporter, !configs[23]->asConfigGpu()); #endif - REPORTER_ASSERT(reporter, configs[27]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[28]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[28]->asConfigGpu()->getSamples() == 4); - REPORTER_ASSERT(reporter, configs[28]->asConfigGpu()->getUseNVPR()); - REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getSamples() == 4); - REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getUseNVPR()); - REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getUseDIText()); - REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getColorType() == kN32_SkColorType); - REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getProfileType() == - kSRGB_SkColorProfileType); - REPORTER_ASSERT(reporter, configs[31]->asConfigGpu()); - REPORTER_ASSERT(reporter, configs[31]->asConfigGpu()->getSamples() == 4); #endif } @@ -172,8 +152,7 @@ DEF_TEST(ParseConfigs_ExtendedGpuConfigsCorrect, reporter) { "gpu(api=mesa,samples=77)", "gpu(dit=true,api=commandbuffer)", "gpu()", - "gpu(api=gles)", - "gpu(api=gl)" + "gpu(api=gles)" }); SkCommandLineConfigArray configs; @@ -224,11 +203,7 @@ DEF_TEST(ParseConfigs_ExtendedGpuConfigsCorrect, reporter) { REPORTER_ASSERT(reporter, !configs[6]->asConfigGpu()->getUseNVPR()); REPORTER_ASSERT(reporter, !configs[6]->asConfigGpu()->getUseDIText()); REPORTER_ASSERT(reporter, configs[6]->asConfigGpu()->getSamples() == 0); - REPORTER_ASSERT(reporter, configs[7]->asConfigGpu()->getContextType() == - GrContextFactory::kGL_GLContextType); - REPORTER_ASSERT(reporter, !configs[7]->asConfigGpu()->getUseNVPR()); - REPORTER_ASSERT(reporter, !configs[7]->asConfigGpu()->getUseDIText()); - REPORTER_ASSERT(reporter, configs[7]->asConfigGpu()->getSamples() == 0); + #endif } |