LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 04:30:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

metal: improve detection of rgba32f format filter and MSAA support.

Browse Source
This commit is contained in:
Alex Szpakowski
2022-01-23 11:28:09 -04:00
parent 6dbb7fa5de
commit a5351e5046
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/metal/Graphics.mm
+26 -8
View File
@@ -1785,6 +1785,7 @@ bool Graphics::isPixelFormatSupported(PixelFormat format, PixelFormatUsageFlags
format = getSRGBPixelFormat(format); format = getSRGBPixelFormat(format);
const uint32 sample = PIXELFORMATUSAGEFLAGS_SAMPLE; const uint32 sample = PIXELFORMATUSAGEFLAGS_SAMPLE;
const uint32 filter = PIXELFORMATUSAGEFLAGS_LINEAR;
const uint32 rt = PIXELFORMATUSAGEFLAGS_RENDERTARGET; const uint32 rt = PIXELFORMATUSAGEFLAGS_RENDERTARGET;
const uint32 blend = PIXELFORMATUSAGEFLAGS_BLEND; const uint32 blend = PIXELFORMATUSAGEFLAGS_BLEND;
const uint32 msaa = PIXELFORMATUSAGEFLAGS_MSAA; const uint32 msaa = PIXELFORMATUSAGEFLAGS_MSAA;
@@ -1820,9 +1821,16 @@ bool Graphics::isPixelFormatSupported(PixelFormat format, PixelFormatUsageFlags
break; break;
case PIXELFORMAT_R32_FLOAT: case PIXELFORMAT_R32_FLOAT:
if (families.apple[1]) if (families.apple[1])
flags |= sample | rt | blend | msaa | computewrite; flags |= sample | rt | blend | computewrite;
if (families.mac[1] || families.macCatalyst[1]) if (families.mac[1] || families.macCatalyst[1])
flags |= all; flags |= (all & ~(msaa | filter));
if (@available(macOS 11.0, iOS 14.0, *))
{
if (device.supports32BitFloatFiltering)
flags |= filter;
if (device.supports32BitMSAA)
flags |= msaa;
}
break; break;
case PIXELFORMAT_RG8_UNORM: case PIXELFORMAT_RG8_UNORM:
@@ -1848,10 +1856,15 @@ bool Graphics::isPixelFormatSupported(PixelFormat format, PixelFormatUsageFlags
case PIXELFORMAT_RG32_FLOAT: case PIXELFORMAT_RG32_FLOAT:
if (families.apple[1]) if (families.apple[1])
flags |= sample | rt | blend | computewrite; flags |= sample | rt | blend | computewrite;
if (families.apple[7])
flags |= sample | rt | msaa | blend | computewrite;
if (families.mac[1] || families.macCatalyst[1]) if (families.mac[1] || families.macCatalyst[1])
flags |= all; flags |= (all & ~(msaa | filter));
if (@available(macOS 11.0, iOS 14.0, *))
{
if (device.supports32BitFloatFiltering)
flags |= filter;
if (device.supports32BitMSAA)
flags |= msaa;
}
break; break;
case PIXELFORMAT_RGBA8_UNORM: case PIXELFORMAT_RGBA8_UNORM:
@@ -1878,10 +1891,15 @@ bool Graphics::isPixelFormatSupported(PixelFormat format, PixelFormatUsageFlags
case PIXELFORMAT_RGBA32_FLOAT: case PIXELFORMAT_RGBA32_FLOAT:
if (families.apple[1]) if (families.apple[1])
flags |= sample | rt | computewrite; flags |= sample | rt | computewrite;
if (families.apple[7])
flags |= sample | rt | msaa | computewrite;
if (families.mac[1] || families.macCatalyst[1]) if (families.mac[1] || families.macCatalyst[1])
flags |= all; flags |= (all & ~(msaa | filter));
if (@available(macOS 11.0, iOS 14.0, *))
{
if (device.supports32BitFloatFiltering)
flags |= filter;
if (device.supports32BitMSAA)
flags |= msaa;
}
break; break;
case PIXELFORMAT_R8_INT: case PIXELFORMAT_R8_INT:
src/modules/graphics/metal/Texture.mm
-1
View File
@@ -94,7 +94,6 @@ Texture::Texture(love::graphics::Graphics *gfxbase, id<MTLDevice> device, const
desc.textureType = getMTLTextureType(texType, actualMSAASamples); desc.textureType = getMTLTextureType(texType, actualMSAASamples);
desc.usage &= ~MTLTextureUsageShaderRead; desc.usage &= ~MTLTextureUsageShaderRead;
// TODO: This needs to be cleared, etc.
msaaTexture = [device newTextureWithDescriptor:desc]; msaaTexture = [device newTextureWithDescriptor:desc];
if (msaaTexture == nil) if (msaaTexture == nil)
{ {