Index: src/gpu/SkGr.cpp |
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp |
index 1463336c498d3fde9eb03adcd3e5a2108037684c..156dbd1e289e783dac14ec7d33f3b60ba015fe0b 100644 |
--- a/src/gpu/SkGr.cpp |
+++ b/src/gpu/SkGr.cpp |
@@ -369,12 +369,13 @@ GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType ct, SkAlphaType, SkColorProf |
case kARGB_4444_SkColorType: |
return kRGBA_4444_GrPixelConfig; |
case kRGBA_8888_SkColorType: |
- //if (kSRGB_SkColorProfileType == pt) { |
- // return kSRGBA_8888_GrPixelConfig; |
- //} |
- return kRGBA_8888_GrPixelConfig; |
+ return (kSRGB_SkColorProfileType == pt) |
+ ? kSRGBA_8888_GrPixelConfig |
bsalomon
2016/03/11 23:16:19
Should we fail if pt is srgb but ct is not rgba_88
Brian Osman
2016/03/17 14:32:04
Done.
|
+ : kRGBA_8888_GrPixelConfig; |
case kBGRA_8888_SkColorType: |
- return kBGRA_8888_GrPixelConfig; |
+ return (kSRGB_SkColorProfileType == pt) |
+ ? kSBGRA_8888_GrPixelConfig |
+ : kBGRA_8888_GrPixelConfig; |
case kIndex_8_SkColorType: |
return kIndex_8_GrPixelConfig; |
case kGray_8_SkColorType: |
@@ -413,6 +414,10 @@ bool GrPixelConfig2ColorAndProfileType(GrPixelConfig config, SkColorType* ctOut, |
ct = kRGBA_8888_SkColorType; |
pt = kSRGB_SkColorProfileType; |
break; |
+ case kSBGRA_8888_GrPixelConfig: |
+ ct = kBGRA_8888_SkColorType; |
+ pt = kSRGB_SkColorProfileType; |
+ break; |
default: |
return false; |
} |