From 0fb6db4be6e30777cc5c87f1b601e8c4aacff2b1 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Wed, 15 Nov 2017 20:48:56 +0000 Subject: 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 --- src/gpu/GrCaps.cpp | 4 -- src/gpu/GrShaderCaps.cpp | 34 +++++----- src/gpu/SkGr.cpp | 4 +- src/gpu/effects/GrDitherEffect.fp | 4 -- src/gpu/effects/GrDitherEffect.h | 4 -- src/gpu/gl/GrGLCaps.cpp | 129 ++++++++++++++------------------------ src/gpu/gl/GrGLGpu.cpp | 4 -- src/gpu/mtl/GrMtlUtil.mm | 12 +--- src/gpu/vk/GrVkCaps.cpp | 5 +- src/gpu/vk/GrVkUtil.cpp | 10 +-- 10 files changed, 70 insertions(+), 140 deletions(-) (limited to 'src/gpu') diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp index 482542be25..2e25845876 100644 --- a/src/gpu/GrCaps.cpp +++ b/src/gpu/GrCaps.cpp @@ -14,8 +14,6 @@ static const char* pixel_config_name(GrPixelConfig config) { switch (config) { case kUnknown_GrPixelConfig: return "Unknown"; case kAlpha_8_GrPixelConfig: return "Alpha8"; - case kAlpha_8_as_Alpha_GrPixelConfig: return "Alpha8_asAlpha"; - case kAlpha_8_as_Red_GrPixelConfig: return "Alpha8_asRed"; case kGray_8_GrPixelConfig: return "Gray8"; case kRGB_565_GrPixelConfig: return "RGB565"; case kRGBA_4444_GrPixelConfig: return "RGBA444"; @@ -27,8 +25,6 @@ static const char* pixel_config_name(GrPixelConfig config) { case kRGBA_float_GrPixelConfig: return "RGBAFloat"; case kRG_float_GrPixelConfig: return "RGFloat"; case kAlpha_half_GrPixelConfig: return "AlphaHalf"; - case kAlpha_half_as_Alpha_GrPixelConfig: return "AlphaHalf_asAlpha"; - case kAlpha_half_as_Red_GrPixelConfig: return "AlphaHalf_asRed"; case kRGBA_half_GrPixelConfig: return "RGBAHalf"; } SK_ABORT("Invalid pixel config"); diff --git a/src/gpu/GrShaderCaps.cpp b/src/gpu/GrShaderCaps.cpp index d4f4475da2..124fd4de40 100644 --- a/src/gpu/GrShaderCaps.cpp +++ b/src/gpu/GrShaderCaps.cpp @@ -212,24 +212,22 @@ void GrShaderCaps::initSamplerPrecisionTable() { } uint8_t* table = fSamplerPrecisions[visibility]; - table[kUnknown_GrPixelConfig] = lowp; - table[kAlpha_8_GrPixelConfig] = lowp; - table[kAlpha_8_as_Alpha_GrPixelConfig] = lowp; - table[kAlpha_8_as_Red_GrPixelConfig] = lowp; - table[kGray_8_GrPixelConfig] = lowp; - table[kRGB_565_GrPixelConfig] = lowp; - table[kRGBA_4444_GrPixelConfig] = lowp; - table[kRGBA_8888_GrPixelConfig] = lowp; - table[kBGRA_8888_GrPixelConfig] = lowp; - table[kSRGBA_8888_GrPixelConfig] = lowp; - table[kSBGRA_8888_GrPixelConfig] = lowp; - table[kRGBA_8888_sint_GrPixelConfig] = lowp; - table[kRGBA_float_GrPixelConfig] = kHigh_GrSLPrecision; - table[kRG_float_GrPixelConfig] = kHigh_GrSLPrecision; - table[kAlpha_half_GrPixelConfig] = mediump; - table[kAlpha_half_as_Alpha_GrPixelConfig] = mediump; - table[kAlpha_half_as_Red_GrPixelConfig] = mediump; - table[kRGBA_half_GrPixelConfig] = mediump; + table[kUnknown_GrPixelConfig] = lowp; + table[kAlpha_8_GrPixelConfig] = lowp; + table[kGray_8_GrPixelConfig] = lowp; + table[kRGB_565_GrPixelConfig] = lowp; + table[kRGBA_4444_GrPixelConfig] = lowp; + table[kRGBA_8888_GrPixelConfig] = lowp; + table[kBGRA_8888_GrPixelConfig] = lowp; + table[kSRGBA_8888_GrPixelConfig] = lowp; + table[kSBGRA_8888_GrPixelConfig] = lowp; + table[kRGBA_8888_sint_GrPixelConfig] = lowp; + table[kRGBA_float_GrPixelConfig] = kHigh_GrSLPrecision; + table[kRG_float_GrPixelConfig] = kHigh_GrSLPrecision; + table[kAlpha_half_GrPixelConfig] = mediump; + table[kRGBA_half_GrPixelConfig] = mediump; + + GR_STATIC_ASSERT(14 == kGrPixelConfigCnt); } } diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 63d0f260b0..026a7482b4 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -368,9 +368,7 @@ GrPixelConfig SkImageInfo2GrPixelConfig(const SkImageInfo& info, const GrCaps& c bool GrPixelConfigToColorType(GrPixelConfig config, SkColorType* ctOut) { SkColorType ct; switch (config) { - case kAlpha_8_GrPixelConfig: // fall through - case kAlpha_8_as_Alpha_GrPixelConfig: // fall through - case kAlpha_8_as_Red_GrPixelConfig: + case kAlpha_8_GrPixelConfig: ct = kAlpha_8_SkColorType; break; case kGray_8_GrPixelConfig: diff --git a/src/gpu/effects/GrDitherEffect.fp b/src/gpu/effects/GrDitherEffect.fp index 22c371ea37..f2d54cf2eb 100644 --- a/src/gpu/effects/GrDitherEffect.fp +++ b/src/gpu/effects/GrDitherEffect.fp @@ -20,15 +20,11 @@ layout(key) in int rangeType; break; case kUnknown_GrPixelConfig: case kAlpha_half_GrPixelConfig: - case kAlpha_half_as_Alpha_GrPixelConfig: - case kAlpha_half_as_Red_GrPixelConfig: case kRGBA_8888_sint_GrPixelConfig: case kRGBA_float_GrPixelConfig: case kRG_float_GrPixelConfig: case kRGBA_half_GrPixelConfig: case kAlpha_8_GrPixelConfig: - case kAlpha_8_as_Alpha_GrPixelConfig: - case kAlpha_8_as_Red_GrPixelConfig: return nullptr; } return std::unique_ptr(new GrDitherEffect(rangeType)); diff --git a/src/gpu/effects/GrDitherEffect.h b/src/gpu/effects/GrDitherEffect.h index 1b1357baff..deb20852ca 100644 --- a/src/gpu/effects/GrDitherEffect.h +++ b/src/gpu/effects/GrDitherEffect.h @@ -36,15 +36,11 @@ public: break; case kUnknown_GrPixelConfig: case kAlpha_half_GrPixelConfig: - case kAlpha_half_as_Alpha_GrPixelConfig: - case kAlpha_half_as_Red_GrPixelConfig: case kRGBA_8888_sint_GrPixelConfig: case kRGBA_float_GrPixelConfig: case kRG_float_GrPixelConfig: case kRGBA_half_GrPixelConfig: case kAlpha_8_GrPixelConfig: - case kAlpha_8_as_Alpha_GrPixelConfig: - case kAlpha_8_as_Red_GrPixelConfig: return nullptr; } return std::unique_ptr(new GrDitherEffect(rangeType)); diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 14ede4fdc1..fe9bce8528 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -1911,46 +1911,33 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, } fConfigTable[kRGBA_4444_GrPixelConfig].fSwizzle = GrSwizzle::RGBA(); - ConfigInfo& alphaInfo = fConfigTable[kAlpha_8_as_Alpha_GrPixelConfig]; - alphaInfo.fFormats.fExternalType = GR_GL_UNSIGNED_BYTE; - alphaInfo.fFormatType = kNormalizedFixedPoint_FormatType; - if (kGL_GrGLStandard== standard || version <= GR_GL_VER(3, 0)) { - alphaInfo.fFlags = ConfigInfo::kTextureable_Flag; - } - alphaInfo.fFormats.fBaseInternalFormat = GR_GL_ALPHA; - alphaInfo.fFormats.fSizedInternalFormat = GR_GL_ALPHA8; - alphaInfo.fFormats.fExternalFormat[kOther_ExternalFormatUsage] = GR_GL_ALPHA; - alphaInfo.fSwizzle = GrSwizzle::AAAA(); - if (fAlpha8IsRenderable && kGL_GrGLStandard== standard) { - alphaInfo.fFlags |= allRenderFlags; - } - - ConfigInfo& redInfo = fConfigTable[kAlpha_8_as_Red_GrPixelConfig]; - redInfo.fFormats.fExternalType = GR_GL_UNSIGNED_BYTE; - redInfo.fFormatType = kNormalizedFixedPoint_FormatType; - redInfo.fFormats.fBaseInternalFormat = GR_GL_RED; - redInfo.fFormats.fSizedInternalFormat = GR_GL_R8; - redInfo.fFormats.fExternalFormat[kOther_ExternalFormatUsage] = GR_GL_RED; - redInfo.fSwizzle = GrSwizzle::RRRR(); - - // ES2 Command Buffer does not allow TexStorage with R8_EXT (so Alpha_8 and Gray_8) - if (texStorageSupported && !isCommandBufferES2) { - alphaInfo.fFlags |= ConfigInfo::kCanUseTexStorage_Flag; - redInfo.fFlags |= ConfigInfo::kCanUseTexStorage_Flag; - } - + fConfigTable[kAlpha_8_GrPixelConfig].fFormats.fExternalType = GR_GL_UNSIGNED_BYTE; + fConfigTable[kAlpha_8_GrPixelConfig].fFormatType = kNormalizedFixedPoint_FormatType; + fConfigTable[kAlpha_8_GrPixelConfig].fFlags = ConfigInfo::kTextureable_Flag; if (this->textureRedSupport()) { - redInfo.fFlags = ConfigInfo::kTextureable_Flag; + fConfigTable[kAlpha_8_GrPixelConfig].fFormats.fBaseInternalFormat = GR_GL_RED; + fConfigTable[kAlpha_8_GrPixelConfig].fFormats.fSizedInternalFormat = GR_GL_R8; + fConfigTable[kAlpha_8_GrPixelConfig].fFormats.fExternalFormat[kOther_ExternalFormatUsage] = + GR_GL_RED; + fConfigTable[kAlpha_8_GrPixelConfig].fSwizzle = GrSwizzle::RRRR(); if (texelBufferSupport) { - redInfo.fFlags |= ConfigInfo::kCanUseWithTexelBuffer_Flag; + fConfigTable[kAlpha_8_GrPixelConfig].fFlags |= ConfigInfo::kCanUseWithTexelBuffer_Flag; } - redInfo.fFlags |= allRenderFlags; - - fConfigTable[kAlpha_8_GrPixelConfig] = redInfo; + fConfigTable[kAlpha_8_GrPixelConfig].fFlags |= allRenderFlags; } else { - redInfo.fFlags = 0; + fConfigTable[kAlpha_8_GrPixelConfig].fFormats.fBaseInternalFormat = GR_GL_ALPHA; + fConfigTable[kAlpha_8_GrPixelConfig].fFormats.fSizedInternalFormat = GR_GL_ALPHA8; + fConfigTable[kAlpha_8_GrPixelConfig].fFormats.fExternalFormat[kOther_ExternalFormatUsage] = + GR_GL_ALPHA; + fConfigTable[kAlpha_8_GrPixelConfig].fSwizzle = GrSwizzle::AAAA(); + if (fAlpha8IsRenderable) { + fConfigTable[kAlpha_8_GrPixelConfig].fFlags |= allRenderFlags; + } + } - fConfigTable[kAlpha_8_GrPixelConfig] = alphaInfo; + // ES2 Command Buffer does not allow TexStorage with R8_EXT (so Alpha_8 and Gray_8) + if (texStorageSupported && !isCommandBufferES2) { + fConfigTable[kAlpha_8_GrPixelConfig].fFlags |= ConfigInfo::kCanUseTexStorage_Flag; } fConfigTable[kGray_8_GrPixelConfig].fFormats.fExternalType = GR_GL_UNSIGNED_BYTE; @@ -2045,60 +2032,44 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, fConfigTable[fpconfig].fSwizzle = GrSwizzle::RGBA(); } - GrGLenum alphaHalfExternalType; - if (kGL_GrGLStandard == ctxInfo.standard() || ctxInfo.version() >= GR_GL_VER(3, 0)) { - alphaHalfExternalType = GR_GL_HALF_FLOAT; + if (this->textureRedSupport()) { + fConfigTable[kAlpha_half_GrPixelConfig].fFormats.fBaseInternalFormat = GR_GL_RED; + fConfigTable[kAlpha_half_GrPixelConfig].fFormats.fSizedInternalFormat = GR_GL_R16F; + fConfigTable[kAlpha_half_GrPixelConfig].fFormats.fExternalFormat[kOther_ExternalFormatUsage] + = GR_GL_RED; + fConfigTable[kAlpha_half_GrPixelConfig].fSwizzle = GrSwizzle::RRRR(); + if (texelBufferSupport) { + fConfigTable[kAlpha_half_GrPixelConfig].fFlags |= + ConfigInfo::kCanUseWithTexelBuffer_Flag; + } } else { - alphaHalfExternalType = GR_GL_HALF_FLOAT_OES; + fConfigTable[kAlpha_half_GrPixelConfig].fFormats.fBaseInternalFormat = GR_GL_ALPHA; + fConfigTable[kAlpha_half_GrPixelConfig].fFormats.fSizedInternalFormat = GR_GL_ALPHA16F; + fConfigTable[kAlpha_half_GrPixelConfig].fFormats.fExternalFormat[kOther_ExternalFormatUsage] + = GR_GL_ALPHA; + fConfigTable[kAlpha_half_GrPixelConfig].fSwizzle = GrSwizzle::AAAA(); } - ConfigInfo& alphaHalf = fConfigTable[kAlpha_half_as_Alpha_GrPixelConfig]; - alphaHalf.fFormats.fExternalType = alphaHalfExternalType; - alphaHalf.fFormatType = kFloat_FormatType; - alphaHalf.fFormats.fBaseInternalFormat = GR_GL_ALPHA; - alphaHalf.fFormats.fSizedInternalFormat = GR_GL_ALPHA16F; - alphaHalf.fFormats.fExternalFormat[kOther_ExternalFormatUsage] = GR_GL_ALPHA; - alphaHalf.fSwizzle = GrSwizzle::AAAA(); - - ConfigInfo& redHalf = fConfigTable[kAlpha_half_as_Red_GrPixelConfig]; - redHalf.fFormats.fExternalType = alphaHalfExternalType; - redHalf.fFormatType = kFloat_FormatType; - redHalf.fFormats.fBaseInternalFormat = GR_GL_RED; - redHalf.fFormats.fSizedInternalFormat = GR_GL_R16F; - redHalf.fFormats.fExternalFormat[kOther_ExternalFormatUsage] = GR_GL_RED; - redHalf.fSwizzle = GrSwizzle::RRRR(); - + if (kGL_GrGLStandard == ctxInfo.standard() || ctxInfo.version() >= GR_GL_VER(3, 0)) { + fConfigTable[kAlpha_half_GrPixelConfig].fFormats.fExternalType = GR_GL_HALF_FLOAT; + } else { + fConfigTable[kAlpha_half_GrPixelConfig].fFormats.fExternalType = GR_GL_HALF_FLOAT_OES; + } + fConfigTable[kAlpha_half_GrPixelConfig].fFormatType = kFloat_FormatType; if (texStorageSupported) { - alphaHalf.fFlags |= ConfigInfo::kCanUseTexStorage_Flag; - redHalf.fFlags |= ConfigInfo::kCanUseTexStorage_Flag; + fConfigTable[kAlpha_half_GrPixelConfig].fFlags |= ConfigInfo::kCanUseTexStorage_Flag; } if (hasHalfFPTextures) { - if (kGL_GrGLStandard == standard || version <= GR_GL_VER(3, 0)) { - alphaHalf.fFlags = ConfigInfo::kTextureable_Flag; - } - redHalf.fFlags = ConfigInfo::kTextureable_Flag; + fConfigTable[kAlpha_half_GrPixelConfig].fFlags = ConfigInfo::kTextureable_Flag; + // ES requires either 3.2 or the combination of EXT_color_buffer_half_float and support for + // GL_RED internal format. if (kGL_GrGLStandard == standard || version >= GR_GL_VER(3, 2) || (this->textureRedSupport() && ctxInfo.hasExtension("GL_EXT_color_buffer_half_float"))) { - if (kGL_GrGLStandard == standard) { - alphaHalf.fFlags |= fpRenderFlags; - } - redHalf.fFlags |= fpRenderFlags; + fConfigTable[kAlpha_half_GrPixelConfig].fFlags |= fpRenderFlags; } } - if (this->textureRedSupport()) { - if (texelBufferSupport) { - redHalf.fFlags |= ConfigInfo::kCanUseWithTexelBuffer_Flag; - } - - fConfigTable[kAlpha_half_GrPixelConfig] = redHalf; - } else { - redHalf.fFlags = 0; - - fConfigTable[kAlpha_half_GrPixelConfig] = alphaHalf; - } - fConfigTable[kRGBA_half_GrPixelConfig].fFormats.fBaseInternalFormat = GR_GL_RGBA; fConfigTable[kRGBA_half_GrPixelConfig].fFormats.fSizedInternalFormat = GR_GL_RGBA16F; fConfigTable[kRGBA_half_GrPixelConfig].fFormats.fExternalFormat[kOther_ExternalFormatUsage] = @@ -2150,12 +2121,8 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, // kAlpha_8_GrPixelConfig. Alpha8 is not a valid signed internal format so we must use the base // internal format for that config when doing TexImage calls. if(kGalliumLLVM_GrGLRenderer == ctxInfo.renderer()) { - SkASSERT(fConfigTable[kAlpha_8_GrPixelConfig].fFormats.fBaseInternalFormat == - fConfigTable[kAlpha_8_as_Alpha_GrPixelConfig].fFormats.fBaseInternalFormat); fConfigTable[kAlpha_8_GrPixelConfig].fFormats.fInternalFormatTexImage = fConfigTable[kAlpha_8_GrPixelConfig].fFormats.fBaseInternalFormat; - fConfigTable[kAlpha_8_as_Alpha_GrPixelConfig].fFormats.fInternalFormatTexImage = - fConfigTable[kAlpha_8_as_Alpha_GrPixelConfig].fFormats.fBaseInternalFormat; } // OpenGL ES 2.0 + GL_EXT_sRGB allows GL_SRGB_ALPHA to be specified as the diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index c69b9243ed..2e832e4447 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -780,15 +780,11 @@ bool GrGLGpu::onWritePixels(GrSurface* surface, GrSurfaceOrigin origin, static inline GrGLint config_alignment(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_Alpha_GrPixelConfig: - case kAlpha_half_as_Red_GrPixelConfig: case kRGBA_half_GrPixelConfig: return 2; case kRGBA_8888_GrPixelConfig: diff --git a/src/gpu/mtl/GrMtlUtil.mm b/src/gpu/mtl/GrMtlUtil.mm index 9e6c632638..24643669ea 100644 --- a/src/gpu/mtl/GrMtlUtil.mm +++ b/src/gpu/mtl/GrMtlUtil.mm @@ -7,8 +7,6 @@ #include "GrMtlUtil.h" -#include "GrTypesPriv.h" - bool GrPixelConfigToMTLFormat(GrPixelConfig config, MTLPixelFormat* format) { MTLPixelFormat dontCare; if (!format) { @@ -47,12 +45,9 @@ bool GrPixelConfigToMTLFormat(GrPixelConfig config, MTLPixelFormat* format) { #else return false; #endif - case kAlpha_8_GrPixelConfig: // fall through - case kAlpha_8_as_Red_GrPixelConfig: + case kAlpha_8_GrPixelConfig: *format = MTLPixelFormatR8Unorm; return true; - case kAlpha_8_as_Alpha_GrPixelConfig: - return false; case kGray_8_GrPixelConfig: *format = MTLPixelFormatR8Unorm; return true; @@ -65,12 +60,9 @@ bool GrPixelConfigToMTLFormat(GrPixelConfig config, MTLPixelFormat* format) { case kRGBA_half_GrPixelConfig: *format = MTLPixelFormatRGBA16Float; return true; - case kAlpha_half_GrPixelConfig: // fall through - case kAlpha_half_as_Red_GrPixelConfig: + case kAlpha_half_GrPixelConfig: *format = MTLPixelFormatR16Float; return true; - case kAlpha_half_as_Alpha_GrPixelConfig: - return false; } SK_ABORT("Unexpected config"); return false; diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp index 6804aeb22f..2b24205af8 100644 --- a/src/gpu/vk/GrVkCaps.cpp +++ b/src/gpu/vk/GrVkCaps.cpp @@ -208,10 +208,7 @@ void GrVkCaps::initShaderCaps(const VkPhysicalDeviceProperties& properties, uint // fConfigOutputSwizzle will default to RGBA so we only need to set it for alpha only config. for (int i = 0; i < kGrPixelConfigCnt; ++i) { GrPixelConfig config = static_cast(i); - // Vulkan doesn't support a single channel format stored in alpha. - if (GrPixelConfigIsAlphaOnly(config) && - kAlpha_8_as_Alpha_GrPixelConfig != config && - kAlpha_half_as_Alpha_GrPixelConfig != config) { + if (GrPixelConfigIsAlphaOnly(config)) { shaderCaps->fConfigTextureSwizzle[i] = GrSwizzle::RRRR(); shaderCaps->fConfigOutputSwizzle[i] = GrSwizzle::AAAA(); } else { diff --git a/src/gpu/vk/GrVkUtil.cpp b/src/gpu/vk/GrVkUtil.cpp index 729804bd32..0ce47cb962 100644 --- a/src/gpu/vk/GrVkUtil.cpp +++ b/src/gpu/vk/GrVkUtil.cpp @@ -42,12 +42,9 @@ bool GrPixelConfigToVkFormat(GrPixelConfig config, VkFormat* format) { // store the data is if it was B4G4R4A4 and swizzle in shaders *format = VK_FORMAT_B4G4R4A4_UNORM_PACK16; return true; - case kAlpha_8_GrPixelConfig: // fall through - case kAlpha_8_as_Red_GrPixelConfig: + case kAlpha_8_GrPixelConfig: *format = VK_FORMAT_R8_UNORM; return true; - case kAlpha_8_as_Alpha_GrPixelConfig: - return false; case kGray_8_GrPixelConfig: *format = VK_FORMAT_R8_UNORM; return true; @@ -60,12 +57,9 @@ bool GrPixelConfigToVkFormat(GrPixelConfig config, VkFormat* format) { case kRGBA_half_GrPixelConfig: *format = VK_FORMAT_R16G16B16A16_SFLOAT; return true; - case kAlpha_half_GrPixelConfig: // fall through - case kAlpha_half_as_Red_GrPixelConfig: + case kAlpha_half_GrPixelConfig: *format = VK_FORMAT_R16_SFLOAT; return true; - case kAlpha_half_as_Alpha_GrPixelConfig: - return false; } SK_ABORT("Unexpected config"); return false; -- cgit v1.2.3