diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-03-23 16:32:22 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-23 21:05:10 +0000 |
| commit | a6a3df7d64dc81082619ab103450fc6d0af7c644 (patch) | |
| tree | 2784182d0508c2535926c9414e8159c0b7f6e458 /include/gpu/GrTypes.h | |
| parent | 49edccd775a38d93701ae376df28463d7848fd16 (diff) | |
Move GrPixelConfig to GrTypesPriv
BUG= skia:6718
Change-Id: I254a5d289c1216e580b8f7fe613236c090d0e901
Reviewed-on: https://skia-review.googlesource.com/116196
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'include/gpu/GrTypes.h')
| -rw-r--r-- | include/gpu/GrTypes.h | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h index 7cb4abbab5..e21bb2c13a 100644 --- a/include/gpu/GrTypes.h +++ b/include/gpu/GrTypes.h @@ -215,51 +215,6 @@ enum class GrMipMapped : bool { /////////////////////////////////////////////////////////////////////////////// -/** - * Pixel configurations. This type conflates texture formats, CPU pixel formats, and - * premultipliedness. We are moving away from it towards SkColorType and backend API (GL, Vulkan) - * texture formats in the pulbic API. Right now this mostly refers to texture formats as we're - * migrating. - */ -enum GrPixelConfig { - kUnknown_GrPixelConfig, - kAlpha_8_GrPixelConfig, - kGray_8_GrPixelConfig, - kRGB_565_GrPixelConfig, - kRGBA_4444_GrPixelConfig, - kRGBA_8888_GrPixelConfig, - kRGB_888_GrPixelConfig, - kBGRA_8888_GrPixelConfig, - kSRGBA_8888_GrPixelConfig, - kSBGRA_8888_GrPixelConfig, - kRGBA_1010102_GrPixelConfig, - kRGBA_float_GrPixelConfig, - kRG_float_GrPixelConfig, - kAlpha_half_GrPixelConfig, - kRGBA_half_GrPixelConfig, - - /** For internal usage. */ - kPrivateConfig1_GrPixelConfig, - kPrivateConfig2_GrPixelConfig, - kPrivateConfig3_GrPixelConfig, - kPrivateConfig4_GrPixelConfig, - kPrivateConfig5_GrPixelConfig, - - kLast_GrPixelConfig = kPrivateConfig5_GrPixelConfig -}; -static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1; - -// Aliases for pixel configs that match skia's byte order. -#ifndef SK_CPU_LENDIAN - #error "Skia gpu currently assumes little endian" -#endif -#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) - static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig; -#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) - static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig; -#else - #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format." -#endif /** * Opaque type for 3D API object handles. We are moving away from this type and towards type-safe |