diff options
| author | Brian Osman <brianosman@google.com> | 2019-01-23 10:41:20 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2019-01-24 16:05:05 +0000 |
| commit | e0cf597556307945a45bcd1ed7154604d182ba77 (patch) | |
| tree | dc4d7174efaf87a38f1feeb94efb2baf4b6f8c48 /libs/hwui/DeviceInfo.cpp | |
| parent | 8d3707bbd5ad908cfa405ce8822a75a04adddb65 (diff) | |
Remove use of SkColorSpace::Gamut enum
Get the gamut matrix from the color space, compare against sRGB/P3.
Test: Refactoring CL.
Change-Id: I9f5bcae8c1f637919ee9da892266ea882f16208c
Diffstat (limited to 'libs/hwui/DeviceInfo.cpp')
| -rw-r--r-- | libs/hwui/DeviceInfo.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libs/hwui/DeviceInfo.cpp b/libs/hwui/DeviceInfo.cpp index 56b1885de820..4c675133a6c1 100644 --- a/libs/hwui/DeviceInfo.cpp +++ b/libs/hwui/DeviceInfo.cpp @@ -62,10 +62,8 @@ DisplayInfo QueryDisplayInfo() { return displayInfo; } -static void queryWideColorGamutPreference(SkColorSpace::Gamut* colorGamut, - sk_sp<SkColorSpace>* colorSpace, SkColorType* colorType) { +static void queryWideColorGamutPreference(sk_sp<SkColorSpace>* colorSpace, SkColorType* colorType) { if (Properties::isolatedProcess) { - *colorGamut = SkColorSpace::Gamut::kSRGB_Gamut; *colorSpace = SkColorSpace::MakeSRGB(); *colorType = SkColorType::kN32_SkColorType; return; @@ -78,16 +76,13 @@ static void queryWideColorGamutPreference(SkColorSpace::Gamut* colorGamut, LOG_ALWAYS_FATAL_IF(status, "Failed to get composition preference, error %d", status); switch (wcgDataspace) { case ui::Dataspace::DISPLAY_P3: - *colorGamut = SkColorSpace::Gamut::kDCIP3_D65_Gamut; *colorSpace = SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB, SkNamedGamut::kDCIP3); break; case ui::Dataspace::V0_SCRGB: - *colorGamut = SkColorSpace::Gamut::kSRGB_Gamut; *colorSpace = SkColorSpace::MakeSRGB(); break; case ui::Dataspace::V0_SRGB: // when sRGB is returned, it means wide color gamut is not supported. - *colorGamut = SkColorSpace::Gamut::kSRGB_Gamut; *colorSpace = SkColorSpace::MakeSRGB(); break; default: @@ -112,7 +107,7 @@ DeviceInfo::DeviceInfo() { mMaxTextureSize = -1; #endif mDisplayInfo = QueryDisplayInfo(); - queryWideColorGamutPreference(&mWideColorGamut, &mWideColorSpace, &mWideColorType); + queryWideColorGamutPreference(&mWideColorSpace, &mWideColorType); } int DeviceInfo::maxTextureSize() const { |