Use device-independent text for nvprmsaa4/16 in nanobench and dm
Use device-independent text rendering in nanobench and dm when
using configs nvprmsaa4 or nvprmsaa16.
This was turned on for dm in commit:
"Re-enable nvpr text rendering in DM"
https://codereview.chromium.org/1306733007
This regressed in commit:
"Add config options to run different GPU APIs to dm and nanobench"
https://codereview.chromium.org/1490113005/
BUG=skia:2992
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1553453004
Review URL: https://codereview.chromium.org/1553453004
diff --git a/tests/TestConfigParsing.cpp b/tests/TestConfigParsing.cpp
index 67d4b22..777d1fb 100644
--- a/tests/TestConfigParsing.cpp
+++ b/tests/TestConfigParsing.cpp
@@ -91,8 +91,10 @@
REPORTER_ASSERT(reporter, configs[11]->asConfigGpu());
REPORTER_ASSERT(reporter, configs[12]->asConfigGpu()->getSamples() == 16);
REPORTER_ASSERT(reporter, configs[12]->asConfigGpu()->getUseNVPR());
+ REPORTER_ASSERT(reporter, configs[12]->asConfigGpu()->getUseDIText());
REPORTER_ASSERT(reporter, configs[13]->asConfigGpu()->getSamples() == 4);
REPORTER_ASSERT(reporter, configs[13]->asConfigGpu()->getUseNVPR());
+ REPORTER_ASSERT(reporter, configs[13]->asConfigGpu()->getUseDIText());
REPORTER_ASSERT(reporter, !configs[14]->asConfigGpu());
REPORTER_ASSERT(reporter, !configs[15]->asConfigGpu());
REPORTER_ASSERT(reporter, !configs[16]->asConfigGpu());
@@ -125,7 +127,7 @@
DEF_TEST(ParseConfigs_ExtendedGpuConfigsCorrect, reporter) {
SkCommandLineFlags::StringArray config1 = make_string_array({
- "gpu(nvpr=true,dit=true)",
+ "gpu(nvpr=true,dit=false)",
"gpu(api=angle)",
"gpu(api=angle-gl)",
"gpu(api=mesa,samples=77)",
@@ -144,7 +146,7 @@
REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getContextType() ==
GrContextFactory::kNative_GLContextType);
REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getUseNVPR());
- REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getUseDIText());
+ REPORTER_ASSERT(reporter, !configs[0]->asConfigGpu()->getUseDIText());
REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getSamples() == 0);
#if SK_ANGLE
#ifdef SK_BUILD_FOR_WIN