Index: include/gpu/GrTypes.h |
diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h |
index 9be500d3b2206e004a9fbed3bc176365bae51d0a..3def9aaa993df434948afe15cf8263d655f42776 100644 |
--- a/include/gpu/GrTypes.h |
+++ b/include/gpu/GrTypes.h |
@@ -218,10 +218,6 @@ |
*/ |
kSRGBA_8888_GrPixelConfig, |
/** |
- * Premultiplied and sRGB. Byte order is b,g,r,a. |
- */ |
- kSBGRA_8888_GrPixelConfig, |
- /** |
* ETC1 Compressed Data |
*/ |
kETC1_GrPixelConfig, |
@@ -272,10 +268,8 @@ |
#endif |
#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) |
static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig; |
- static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSBGRA_8888_GrPixelConfig; |
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) |
static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig; |
- static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSRGBA_8888_GrPixelConfig; |
#else |
#error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format." |
#endif |
@@ -317,7 +311,6 @@ |
case kRGBA_8888_GrPixelConfig: |
case kBGRA_8888_GrPixelConfig: |
case kSRGBA_8888_GrPixelConfig: |
- case kSBGRA_8888_GrPixelConfig: |
return true; |
default: |
return false; |
@@ -329,7 +322,6 @@ |
static inline bool GrPixelConfigIsSRGB(GrPixelConfig config) { |
switch (config) { |
case kSRGBA_8888_GrPixelConfig: |
- case kSBGRA_8888_GrPixelConfig: |
return true; |
default: |
return false; |
@@ -344,10 +336,6 @@ |
return kRGBA_8888_GrPixelConfig; |
case kRGBA_8888_GrPixelConfig: |
return kBGRA_8888_GrPixelConfig; |
- case kSBGRA_8888_GrPixelConfig: |
- return kSRGBA_8888_GrPixelConfig; |
- case kSRGBA_8888_GrPixelConfig: |
- return kSBGRA_8888_GrPixelConfig; |
default: |
return kUnknown_GrPixelConfig; |
} |
@@ -365,7 +353,6 @@ |
case kRGBA_8888_GrPixelConfig: |
case kBGRA_8888_GrPixelConfig: |
case kSRGBA_8888_GrPixelConfig: |
- case kSBGRA_8888_GrPixelConfig: |
return 4; |
case kRGBA_half_GrPixelConfig: |
return 8; |
@@ -396,16 +383,6 @@ |
return true; |
default: |
return false; |
- } |
-} |
- |
-static inline bool GrAllowSRGBForDestinationPixelConfig(GrPixelConfig config) { |
- switch (config) { |
- case kRGBA_8888_GrPixelConfig: |
- case kBGRA_8888_GrPixelConfig: |
- return false; |
- default: |
- return true; |
} |
} |