From 5711133a1b216bfa5d1d24aaffd32dc02c64b333 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 5 Feb 2018 15:55:54 -0500 Subject: Remove integer texture support Change-Id: I0db1c4d705711b8d980bbe0d986013daec6c8ef3 Reviewed-on: https://skia-review.googlesource.com/103762 Commit-Queue: Robert Phillips Reviewed-by: Robert Phillips --- src/gpu/mtl/GrMtlCaps.mm | 4 ---- src/gpu/mtl/GrMtlTexture.mm | 4 ---- src/gpu/mtl/GrMtlUtil.mm | 5 ----- 3 files changed, 13 deletions(-) (limited to 'src/gpu/mtl') diff --git a/src/gpu/mtl/GrMtlCaps.mm b/src/gpu/mtl/GrMtlCaps.mm index 0bb7530fe2..865aa37fe6 100644 --- a/src/gpu/mtl/GrMtlCaps.mm +++ b/src/gpu/mtl/GrMtlCaps.mm @@ -289,10 +289,6 @@ void GrMtlCaps::initConfigTable() { info = &fConfigTable[kSBGRA_8888_GrPixelConfig]; info->fFlags = ConfigInfo::kAllFlags; - // RGBA_8888_sint uses RGBA8Sint - info = &fConfigTable[kRGBA_8888_sint_GrPixelConfig]; - info->fFlags = ConfigInfo::kMSAA_Flag; - // RGBA_float uses RGBA32Float info = &fConfigTable[kRGBA_float_GrPixelConfig]; if (this->isMac()) { diff --git a/src/gpu/mtl/GrMtlTexture.mm b/src/gpu/mtl/GrMtlTexture.mm index 26e5918faf..92afe31a9a 100644 --- a/src/gpu/mtl/GrMtlTexture.mm +++ b/src/gpu/mtl/GrMtlTexture.mm @@ -48,10 +48,6 @@ sk_sp GrMtlTexture::CreateNewTexture(GrMtlGpu* gpu, SkBudgeted bud // This method parallels GrTextureProxy::highestFilterMode static inline GrSamplerState::Filter highest_filter_mode(GrPixelConfig config) { - if (GrPixelConfigIsSint(config)) { - // We only ever want to nearest-neighbor sample signed int textures. - return GrSamplerState::Filter::kNearest; - } return GrSamplerState::Filter::kMipMap; } diff --git a/src/gpu/mtl/GrMtlUtil.mm b/src/gpu/mtl/GrMtlUtil.mm index d05b9988e9..a188afe4ad 100644 --- a/src/gpu/mtl/GrMtlUtil.mm +++ b/src/gpu/mtl/GrMtlUtil.mm @@ -30,9 +30,6 @@ bool GrPixelConfigToMTLFormat(GrPixelConfig config, MTLPixelFormat* format) { case kSBGRA_8888_GrPixelConfig: *format = MTLPixelFormatBGRA8Unorm_sRGB; return true; - case kRGBA_8888_sint_GrPixelConfig: - *format = MTLPixelFormatRGBA8Sint; - return true; case kRGB_565_GrPixelConfig: #ifdef SK_BUILD_FOR_IOS *format = MTLPixelFormatR5G6B5Unorm; @@ -87,8 +84,6 @@ GrPixelConfig GrMTLFormatToPixelConfig(MTLPixelFormat format) { return kSRGBA_8888_GrPixelConfig; case MTLPixelFormatBGRA8Unorm_sRGB: return kSBGRA_8888_GrPixelConfig; - case MTLPixelFormatRGBA8Sint: - return kRGBA_8888_sint_GrPixelConfig; #ifdef SK_BUILD_FOR_IOS case MTLPixelFormatB5G6R5Unorm: return kRGB_565_GrPixelConfig; -- cgit v1.2.3