| Index: include/gpu/GrColor.h
|
| diff --git a/include/gpu/GrColor.h b/include/gpu/GrColor.h
|
| index af394d713b710d8beda000d5f8dfa0aaa4a5ac7f..c53e4b219d3b9524171b576520631521975afcfe 100644
|
| --- a/include/gpu/GrColor.h
|
| +++ b/include/gpu/GrColor.h
|
| @@ -135,21 +135,23 @@ static inline uint32_t GrPixelConfigComponentMask(GrPixelConfig config) {
|
| kRGB_GrColorComponentFlags, // kETC1_GrPixelConfig
|
| kA_GrColorComponentFlag, // kLATC_GrPixelConfig
|
| kA_GrColorComponentFlag, // kR11_EAC_GrPixelConfig
|
| + kRGBA_GrColorComponentFlags, // kASTC_12x12_GrPixelConfig
|
| kRGBA_GrColorComponentFlags, // kRGBA_float_GrPixelConfig
|
| };
|
| return kFlags[config];
|
|
|
| - GR_STATIC_ASSERT(0 == kUnknown_GrPixelConfig);
|
| - GR_STATIC_ASSERT(1 == kAlpha_8_GrPixelConfig);
|
| - GR_STATIC_ASSERT(2 == kIndex_8_GrPixelConfig);
|
| - GR_STATIC_ASSERT(3 == kRGB_565_GrPixelConfig);
|
| - GR_STATIC_ASSERT(4 == kRGBA_4444_GrPixelConfig);
|
| - GR_STATIC_ASSERT(5 == kRGBA_8888_GrPixelConfig);
|
| - GR_STATIC_ASSERT(6 == kBGRA_8888_GrPixelConfig);
|
| - GR_STATIC_ASSERT(7 == kETC1_GrPixelConfig);
|
| - GR_STATIC_ASSERT(8 == kLATC_GrPixelConfig);
|
| - GR_STATIC_ASSERT(9 == kR11_EAC_GrPixelConfig);
|
| - GR_STATIC_ASSERT(10 == kRGBA_float_GrPixelConfig);
|
| + GR_STATIC_ASSERT(0 == kUnknown_GrPixelConfig);
|
| + GR_STATIC_ASSERT(1 == kAlpha_8_GrPixelConfig);
|
| + GR_STATIC_ASSERT(2 == kIndex_8_GrPixelConfig);
|
| + GR_STATIC_ASSERT(3 == kRGB_565_GrPixelConfig);
|
| + GR_STATIC_ASSERT(4 == kRGBA_4444_GrPixelConfig);
|
| + GR_STATIC_ASSERT(5 == kRGBA_8888_GrPixelConfig);
|
| + GR_STATIC_ASSERT(6 == kBGRA_8888_GrPixelConfig);
|
| + GR_STATIC_ASSERT(7 == kETC1_GrPixelConfig);
|
| + GR_STATIC_ASSERT(8 == kLATC_GrPixelConfig);
|
| + GR_STATIC_ASSERT(9 == kR11_EAC_GrPixelConfig);
|
| + GR_STATIC_ASSERT(10 == kASTC_12x12_GrPixelConfig);
|
| + GR_STATIC_ASSERT(11 == kRGBA_float_GrPixelConfig);
|
| GR_STATIC_ASSERT(SK_ARRAY_COUNT(kFlags) == kGrPixelConfigCnt);
|
| }
|
|
|
|
|