diff options
| -rw-r--r-- | tests/TestConfigParsing.cpp | 6 | ||||
| -rw-r--r-- | tools/flags/SkCommonFlagsConfig.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/TestConfigParsing.cpp b/tests/TestConfigParsing.cpp index 61775d5ab2..620a7c42ea 100644 --- a/tests/TestConfigParsing.cpp +++ b/tests/TestConfigParsing.cpp @@ -47,7 +47,7 @@ DEF_TEST(ParseConfigs_Gpu, reporter) { REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getUseInstanced() == 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()->getColorType() == kRGBA_8888_SkColorType); REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getColorSpace() == nullptr); #endif } @@ -127,7 +127,7 @@ DEF_TEST(ParseConfigs_DefaultConfigs, reporter) { REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getColorSpace()->gammaIsLinear()); REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getColorSpace()->toXYZD50() == srgbColorSpace->toXYZD50()); - REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getColorType() == kN32_SkColorType); + REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getColorType() == kRGBA_8888_SkColorType); REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getColorSpace() == srgbColorSpace.get()); REPORTER_ASSERT(reporter, configs[41]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType); REPORTER_ASSERT(reporter, configs[41]->asConfigGpu()->getColorSpace()); @@ -194,7 +194,7 @@ DEF_TEST(ParseConfigs_DefaultConfigs, reporter) { 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()->getColorType() == kRGBA_8888_SkColorType); REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getColorSpace() == srgbColorSpace.get()); REPORTER_ASSERT(reporter, configs[31]->asConfigGpu()); REPORTER_ASSERT(reporter, configs[31]->asConfigGpu()->getSamples() == 4); diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp index d0e5f60e4f..74db3ee833 100644 --- a/tools/flags/SkCommonFlagsConfig.cpp +++ b/tools/flags/SkCommonFlagsConfig.cpp @@ -267,7 +267,7 @@ static bool parse_option_gpu_color(const SkString& value, SkColorType* outColorType, sk_sp<SkColorSpace>* outColorSpace) { if (value.equals("8888")) { - *outColorType = kN32_SkColorType; + *outColorType = kRGBA_8888_SkColorType; *outColorSpace = nullptr; return true; } @@ -307,7 +307,7 @@ static bool parse_option_gpu_color(const SkString& value, return true; } if (commands[0].equals("srgb")) { - *outColorType = kN32_SkColorType; + *outColorType = kRGBA_8888_SkColorType; *outColorSpace = colorSpace; return true; } @@ -329,7 +329,7 @@ SkCommandLineConfigGpu* parse_command_line_config_gpu(const SkString& tag, bool seenSamples = false; int samples = 0; bool seenColor = false; - SkColorType colorType = kN32_SkColorType; + SkColorType colorType = kRGBA_8888_SkColorType; sk_sp<SkColorSpace> colorSpace = nullptr; SkTArray<SkString> optionParts; |