Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

Unified Diff: tests/TestConfigParsing.cpp

Issue 1748823002: Revert of Progress on gamma-correctness in the GPU backend. Fixed conversion of color and profile type to pix… (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/SkGr.cpp ('k') | tools/flags/SkCommonFlagsConfig.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/TestConfigParsing.cpp
diff --git a/tests/TestConfigParsing.cpp b/tests/TestConfigParsing.cpp
index e456c2e3b2c8b906dc632973e0bdde59ad0cbeec..f1f353edb2f60f23e7e5688e16cd9919a19b18c9 100644
--- a/tests/TestConfigParsing.cpp
+++ b/tests/TestConfigParsing.cpp
@@ -43,9 +43,6 @@
REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getUseNVPR() == false);
REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getUseDIText() == false);
REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getSamples() == 0);
- REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getColorType() == kN32_SkColorType);
- REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getProfileType()
- == kLinear_SkColorProfileType);
#endif
}
@@ -68,8 +65,7 @@
SkCommandLineFlags::StringArray config1 = make_string_array({
"565", "8888", "debug", "gpu", "gpudebug", "gpudft", "gpunull", "msaa16", "msaa4",
"nonrendering", "null", "nullgpu", "nvprmsaa16", "nvprmsaa4", "pdf", "pdf_poppler",
- "skp", "svg", "xps", "angle", "angle-gl", "commandbuffer", "mesa", "hwui",
- "gpuf16", "gpusrgb", "anglesrgb"
+ "skp", "svg", "xps", "angle", "angle-gl", "commandbuffer", "mesa", "hwui"
});
SkCommandLineConfigArray configs;
@@ -105,22 +101,11 @@
REPORTER_ASSERT(reporter, !configs[17]->asConfigGpu());
REPORTER_ASSERT(reporter, !configs[18]->asConfigGpu());
REPORTER_ASSERT(reporter, !configs[23]->asConfigGpu());
- REPORTER_ASSERT(reporter, configs[24]->asConfigGpu()->getColorType()
- == kRGBA_F16_SkColorType);
- REPORTER_ASSERT(reporter, configs[24]->asConfigGpu()->getProfileType()
- == kLinear_SkColorProfileType);
- REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getColorType()
- == kN32_SkColorType);
- REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getProfileType()
- == kSRGB_SkColorProfileType);
#if SK_ANGLE
#ifdef SK_BUILD_FOR_WIN
REPORTER_ASSERT(reporter, configs[19]->asConfigGpu());
- REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getProfileType()
- == kSRGB_SkColorProfileType);
#else
REPORTER_ASSERT(reporter, !configs[19]->asConfigGpu());
- REPORTER_ASSERT(reporter, !configs[26]->asConfigGpu());
#endif
REPORTER_ASSERT(reporter, configs[20]->asConfigGpu());
#else
« no previous file with comments | « src/gpu/SkGr.cpp ('k') | tools/flags/SkCommonFlagsConfig.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698