diff --git a/src/modules/graphics/metal/Metal.mm b/src/modules/graphics/metal/Metal.mm index 82fc1407c..f70bc9619 100644 --- a/src/modules/graphics/metal/Metal.mm +++ b/src/modules/graphics/metal/Metal.mm @@ -156,19 +156,16 @@ Metal::PixelFormatDesc Metal::convertPixelFormat(id device, PixelForm break; case PIXELFORMAT_RGBA4_UNORM: -#ifdef LOVE_IOS - mtlformat = MTLPixelFormatABGR4Unorm; -#endif + if (@available(macOS 11.0, iOS 8.0, *)) + mtlformat = MTLPixelFormatABGR4Unorm; break; case PIXELFORMAT_RGB5A1_UNORM: -#ifdef LOVE_IOS - mtlformat = MTLPixelFormatA1BGR5Unorm; -#endif + if (@available(macOS 11.0, iOS 8.0, *)) + mtlformat = MTLPixelFormatA1BGR5Unorm; break; case PIXELFORMAT_RGB565_UNORM: -#ifdef LOVE_IOS - mtlformat = MTLPixelFormatB5G6R5Unorm; -#endif + if (@available(macOS 11.0, iOS 8.0, *)) + mtlformat = MTLPixelFormatB5G6R5Unorm; break; case PIXELFORMAT_RGB10A2_UNORM: mtlformat = MTLPixelFormatRGB10A2Unorm; diff --git a/src/modules/graphics/metal/Texture.mm b/src/modules/graphics/metal/Texture.mm index 6530cc284..fcd01885c 100644 --- a/src/modules/graphics/metal/Texture.mm +++ b/src/modules/graphics/metal/Texture.mm @@ -235,14 +235,13 @@ void Texture::uploadByteData(PixelFormat pixelformat, const void *data, size_t s switch (pixelformat) { -#ifdef LOVE_IOS case PIXELFORMAT_PVR1_RGB2_UNORM: case PIXELFORMAT_PVR1_RGB4_UNORM: case PIXELFORMAT_PVR1_RGBA2_UNORM: case PIXELFORMAT_PVR1_RGBA4_UNORM: - options |= MTLBlitOptionRowLinearPVRTC; + if (@available(macOS 11.0, iOS 9.0, *)) + options |= MTLBlitOptionRowLinearPVRTC; break; -#endif default: break; }