From 68ab18611a03449915dfe2ffef96a849b72aa95c Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Fri, 17 Nov 2017 13:23:40 -0500 Subject: Revert "Revert "Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half"""" This reverts commit 3b2f5b60ff9a82ade01746d7e7cbbcc9348d6c03. Reason for revert: more attempts at a fixed version Original change's description: > Revert "Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half""" > > This reverts commit b5fb7cf0163ccb939f90ecf53ef70732c01f23ae. > > Reason for revert: breaking more devices > > Original change's description: > > Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half"" > > > > This reverts commit 0fb6db4be6e30777cc5c87f1b601e8c4aacff2b1. > > > > Reason for revert: fixed bug > > > > Original change's description: > > > Revert "Add private grpixelconfigs for alpha_8 and alpha_half" > > > > > > This reverts commit 33d17cbb003975fff895954435183756f9893c17. > > > > > > Reason for revert: broke intel bots > > > > > > Original change's description: > > > > Add private grpixelconfigs for alpha_8 and alpha_half > > > > > > > > Bug: skia: > > > > Change-Id: I5191b6e045aea2a5af2b305b5972ad1e638a7ace > > > > Reviewed-on: https://skia-review.googlesource.com/71763 > > > > Reviewed-by: Brian Salomon > > > > Commit-Queue: Greg Daniel > > > > > > TBR=egdaniel@google.com,bsalomon@google.com > > > > > > Change-Id: I6fff9241f7878f1ec7fad2663df9922c9cd8f628 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: skia: > > > Reviewed-on: https://skia-review.googlesource.com/72180 > > > Reviewed-by: Greg Daniel > > > Commit-Queue: Greg Daniel > > > > TBR=egdaniel@google.com,bsalomon@google.com > > > > Change-Id: Ie028961ecbf5934c53cb859e019e548935b3af79 > > Reviewed-on: https://skia-review.googlesource.com/72241 > > Commit-Queue: Greg Daniel > > Reviewed-by: Greg Daniel > > TBR=egdaniel@google.com,bsalomon@google.com > > Change-Id: Ieaac3eca2fc4919699c7de61a3c33348e92a7da0 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/72660 > Reviewed-by: Greg Daniel > Commit-Queue: Greg Daniel TBR=egdaniel@google.com,bsalomon@google.com Change-Id: Ifcf1b97c2a9493ce9a77a8aa0f4e5a8fb393def3 Reviewed-on: https://skia-review.googlesource.com/72802 Commit-Queue: Greg Daniel Reviewed-by: Greg Daniel --- include/private/GrTypesPriv.h | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'include/private') diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h index cd1c0d4483..4c63599927 100644 --- a/include/private/GrTypesPriv.h +++ b/include/private/GrTypesPriv.h @@ -705,6 +705,14 @@ enum class GrMipMapsStatus { GR_MAKE_BITFIELD_CLASS_OPS(GpuPathRenderers) +/** + * We want to extend the GrPixelConfig enum to add cases for dealing with alpha_8 which is + * internally either alpha8 or red8 + */ +static constexpr GrPixelConfig kAlpha_8_as_Alpha_GrPixelConfig = kPrivateConfig1_GrPixelConfig; +static constexpr GrPixelConfig kAlpha_8_as_Red_GrPixelConfig = kPrivateConfig2_GrPixelConfig; +static constexpr GrPixelConfig kAlpha_half_as_Red_GrPixelConfig = kPrivateConfig3_GrPixelConfig; + /** * Utility functions for GrPixelConfig */ @@ -718,6 +726,8 @@ static inline bool GrPixelConfigIs8888Unorm(GrPixelConfig config) { return true; case kUnknown_GrPixelConfig: case kAlpha_8_GrPixelConfig: + case kAlpha_8_as_Alpha_GrPixelConfig: + case kAlpha_8_as_Red_GrPixelConfig: case kGray_8_GrPixelConfig: case kRGB_565_GrPixelConfig: case kRGBA_4444_GrPixelConfig: @@ -725,6 +735,7 @@ static inline bool GrPixelConfigIs8888Unorm(GrPixelConfig config) { case kRGBA_float_GrPixelConfig: case kRG_float_GrPixelConfig: case kAlpha_half_GrPixelConfig: + case kAlpha_half_as_Red_GrPixelConfig: case kRGBA_half_GrPixelConfig: return false; } @@ -741,6 +752,8 @@ static inline bool GrPixelConfigIsSRGB(GrPixelConfig config) { return true; case kUnknown_GrPixelConfig: case kAlpha_8_GrPixelConfig: + case kAlpha_8_as_Alpha_GrPixelConfig: + case kAlpha_8_as_Red_GrPixelConfig: case kGray_8_GrPixelConfig: case kRGB_565_GrPixelConfig: case kRGBA_4444_GrPixelConfig: @@ -750,6 +763,7 @@ static inline bool GrPixelConfigIsSRGB(GrPixelConfig config) { case kRGBA_float_GrPixelConfig: case kRG_float_GrPixelConfig: case kAlpha_half_GrPixelConfig: + case kAlpha_half_as_Red_GrPixelConfig: case kRGBA_half_GrPixelConfig: return false; } @@ -771,6 +785,8 @@ static inline GrPixelConfig GrPixelConfigSwapRAndB(GrPixelConfig config) { return kSBGRA_8888_GrPixelConfig; case kUnknown_GrPixelConfig: case kAlpha_8_GrPixelConfig: + case kAlpha_8_as_Alpha_GrPixelConfig: + case kAlpha_8_as_Red_GrPixelConfig: case kGray_8_GrPixelConfig: case kRGB_565_GrPixelConfig: case kRGBA_4444_GrPixelConfig: @@ -778,6 +794,7 @@ static inline GrPixelConfig GrPixelConfigSwapRAndB(GrPixelConfig config) { case kRGBA_float_GrPixelConfig: case kRG_float_GrPixelConfig: case kAlpha_half_GrPixelConfig: + case kAlpha_half_as_Red_GrPixelConfig: case kRGBA_half_GrPixelConfig: return kUnknown_GrPixelConfig; } @@ -788,11 +805,14 @@ static inline GrPixelConfig GrPixelConfigSwapRAndB(GrPixelConfig config) { static inline size_t GrBytesPerPixel(GrPixelConfig config) { switch (config) { case kAlpha_8_GrPixelConfig: + case kAlpha_8_as_Alpha_GrPixelConfig: + case kAlpha_8_as_Red_GrPixelConfig: case kGray_8_GrPixelConfig: return 1; case kRGB_565_GrPixelConfig: case kRGBA_4444_GrPixelConfig: case kAlpha_half_GrPixelConfig: + case kAlpha_half_as_Red_GrPixelConfig: return 2; case kRGBA_8888_GrPixelConfig: case kBGRA_8888_GrPixelConfig: @@ -820,8 +840,11 @@ static inline bool GrPixelConfigIsOpaque(GrPixelConfig config) { case kRG_float_GrPixelConfig: return true; case kAlpha_8_GrPixelConfig: + case kAlpha_8_as_Alpha_GrPixelConfig: + case kAlpha_8_as_Red_GrPixelConfig: case kRGBA_4444_GrPixelConfig: case kAlpha_half_GrPixelConfig: + case kAlpha_half_as_Red_GrPixelConfig: case kRGBA_8888_GrPixelConfig: case kBGRA_8888_GrPixelConfig: case kSRGBA_8888_GrPixelConfig: @@ -839,7 +862,10 @@ static inline bool GrPixelConfigIsOpaque(GrPixelConfig config) { static inline bool GrPixelConfigIsAlphaOnly(GrPixelConfig config) { switch (config) { case kAlpha_8_GrPixelConfig: + case kAlpha_8_as_Alpha_GrPixelConfig: + case kAlpha_8_as_Red_GrPixelConfig: case kAlpha_half_GrPixelConfig: + case kAlpha_half_as_Red_GrPixelConfig: return true; case kUnknown_GrPixelConfig: case kGray_8_GrPixelConfig: @@ -864,10 +890,13 @@ static inline bool GrPixelConfigIsFloatingPoint(GrPixelConfig config) { case kRGBA_float_GrPixelConfig: case kRG_float_GrPixelConfig: case kAlpha_half_GrPixelConfig: + case kAlpha_half_as_Red_GrPixelConfig: case kRGBA_half_GrPixelConfig: return true; case kUnknown_GrPixelConfig: case kAlpha_8_GrPixelConfig: + case kAlpha_8_as_Alpha_GrPixelConfig: + case kAlpha_8_as_Red_GrPixelConfig: case kGray_8_GrPixelConfig: case kRGB_565_GrPixelConfig: case kRGBA_4444_GrPixelConfig: @@ -889,6 +918,8 @@ static inline bool GrPixelConfigIsSint(GrPixelConfig config) { static inline bool GrPixelConfigIsUnorm(GrPixelConfig config) { switch (config) { case kAlpha_8_GrPixelConfig: + case kAlpha_8_as_Alpha_GrPixelConfig: + case kAlpha_8_as_Red_GrPixelConfig: case kGray_8_GrPixelConfig: case kRGB_565_GrPixelConfig: case kRGBA_4444_GrPixelConfig: @@ -899,6 +930,7 @@ static inline bool GrPixelConfigIsUnorm(GrPixelConfig config) { return true; case kUnknown_GrPixelConfig: case kAlpha_half_GrPixelConfig: + case kAlpha_half_as_Red_GrPixelConfig: case kRGBA_8888_sint_GrPixelConfig: case kRGBA_float_GrPixelConfig: case kRG_float_GrPixelConfig: @@ -916,6 +948,8 @@ static inline GrSLPrecision GrSLSamplerPrecision(GrPixelConfig config) { switch (config) { case kUnknown_GrPixelConfig: case kAlpha_8_GrPixelConfig: + case kAlpha_8_as_Alpha_GrPixelConfig: + case kAlpha_8_as_Red_GrPixelConfig: case kGray_8_GrPixelConfig: case kRGB_565_GrPixelConfig: case kRGBA_4444_GrPixelConfig: @@ -929,6 +963,7 @@ static inline GrSLPrecision GrSLSamplerPrecision(GrPixelConfig config) { case kRG_float_GrPixelConfig: return kHigh_GrSLPrecision; case kAlpha_half_GrPixelConfig: + case kAlpha_half_as_Red_GrPixelConfig: case kRGBA_half_GrPixelConfig: return kMedium_GrSLPrecision; } @@ -941,5 +976,4 @@ static inline GrPixelConfigIsClamped GrGetPixelConfigIsClamped(GrPixelConfig con : GrPixelConfigIsClamped::kYes; } - #endif -- cgit v1.2.3