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

metal: fix depth24stencil8 fallback on macOS

Browse Source
This commit is contained in:
Alex Szpakowski
2021-12-24 22:20:25 -04:00
parent 2868ede191
commit 759937a458
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/metal/Graphics.mm
+9 -7
View File
@@ -837,7 +837,6 @@ void Graphics::applyRenderState(id<MTLRenderCommandEncoder> encoder, const Verte
{ {
lastVertexAttributes = attributes; lastVertexAttributes = attributes;
// Shader *shader = (Shader *) state.shader.get();
Shader *shader = (Shader *) Shader::current; Shader *shader = (Shader *) Shader::current;
id<MTLRenderPipelineState> pipeline = nil; id<MTLRenderPipelineState> pipeline = nil;
@@ -849,18 +848,21 @@ void Graphics::applyRenderState(id<MTLRenderCommandEncoder> encoder, const Verte
key.blend = state.blend; key.blend = state.blend;
key.colorChannelMask = state.colorMask; key.colorChannelMask = state.colorMask;
const auto &rts = state.renderTargets.colors;
for (size_t i = 0; i < rts.size(); i++)
key.colorRenderTargetFormats |= (rts[i].texture->getPixelFormat()) << (8 * i);
if (state.renderTargets.getFirstTarget().texture.get() == nullptr) if (state.renderTargets.getFirstTarget().texture.get() == nullptr)
{ {
key.colorRenderTargetFormats = isGammaCorrect() ? PIXELFORMAT_BGRA8_UNORM_sRGB : PIXELFORMAT_BGRA8_UNORM; key.colorRenderTargetFormats = isGammaCorrect() ? PIXELFORMAT_BGRA8_UNORM_sRGB : PIXELFORMAT_BGRA8_UNORM;
key.depthStencilFormat = backbufferDepthStencil->getPixelFormat(); key.depthStencilFormat = backbufferDepthStencil->getPixelFormat();
} }
else
{
const auto &rts = state.renderTargets.colors;
for (size_t i = 0; i < rts.size(); i++)
key.colorRenderTargetFormats |= (rts[i].texture->getPixelFormat()) << (8 * i);
// TODO: depth/stencil // TODO: automatic depth/stencil (state doesn't store it).
if (state.renderTargets.depthStencil.texture.get())
key.depthStencilFormat = state.renderTargets.depthStencil.texture->getPixelFormat();
}
pipeline = shader->getCachedRenderPipeline(key); pipeline = shader->getCachedRenderPipeline(key);
} }
src/modules/graphics/metal/Metal.h
+1 -1
View File
@@ -44,7 +44,7 @@ public:
}; };
API_AVAILABLE(macos(10.15), ios(13.0)) API_AVAILABLE(macos(10.15), ios(13.0))
static PixelFormatDesc convertPixelFormat(PixelFormat format, bool &isSRGB); static PixelFormatDesc convertPixelFormat(id<MTLDevice> device, PixelFormat format, bool &isSRGB);
}; // Metal }; // Metal
src/modules/graphics/metal/Metal.mm
+5 -2
View File
@@ -28,7 +28,7 @@ namespace graphics
namespace metal namespace metal
{ {
Metal::PixelFormatDesc Metal::convertPixelFormat(PixelFormat format, bool &isSRGB) Metal::PixelFormatDesc Metal::convertPixelFormat(id<MTLDevice> device, PixelFormat format, bool &isSRGB)
{ {
MTLPixelFormat mtlformat = MTLPixelFormatInvalid; MTLPixelFormat mtlformat = MTLPixelFormatInvalid;
PixelFormatDesc desc = {}; PixelFormatDesc desc = {};
@@ -192,7 +192,10 @@ Metal::PixelFormatDesc Metal::convertPixelFormat(PixelFormat format, bool &isSRG
#ifdef LOVE_IOS #ifdef LOVE_IOS
mtlformat = MTLPixelFormatDepth32Float_Stencil8; mtlformat = MTLPixelFormatDepth32Float_Stencil8;
#else #else
mtlformat = MTLPixelFormatDepth24Unorm_Stencil8; if ([device isDepth24Stencil8PixelFormatSupported])
mtlformat = MTLPixelFormatDepth24Unorm_Stencil8;
else
mtlformat = MTLPixelFormatDepth32Float_Stencil8;
#endif #endif
break; break;
case PIXELFORMAT_DEPTH32_FLOAT_STENCIL8: case PIXELFORMAT_DEPTH32_FLOAT_STENCIL8:
src/modules/graphics/metal/Shader.mm
+2 -2
View File
@@ -931,7 +931,7 @@ id<MTLRenderPipelineState> Shader::getCachedRenderPipeline(const RenderPipelineK
// We already don't really support metal on older systems, this just // We already don't really support metal on older systems, this just
// silences a compiler warning about it. // silences a compiler warning about it.
bool isSRGB = false; bool isSRGB = false;
auto formatdesc = Metal::convertPixelFormat(format, isSRGB); auto formatdesc = Metal::convertPixelFormat(device, format, isSRGB);
attachment.pixelFormat = formatdesc.format; attachment.pixelFormat = formatdesc.format;
} }
@@ -969,7 +969,7 @@ id<MTLRenderPipelineState> Shader::getCachedRenderPipeline(const RenderPipelineK
// We already don't really support metal on older systems, this just // We already don't really support metal on older systems, this just
// silences a compiler warning about it. // silences a compiler warning about it.
bool isSRGB = false; bool isSRGB = false;
auto formatdesc = Metal::convertPixelFormat(dsformat, isSRGB); auto formatdesc = Metal::convertPixelFormat(device, dsformat, isSRGB);
if (isPixelFormatDepth(dsformat)) if (isPixelFormatDepth(dsformat))
desc.depthAttachmentPixelFormat = formatdesc.format; desc.depthAttachmentPixelFormat = formatdesc.format;
if (isPixelFormatStencil(dsformat)) if (isPixelFormatStencil(dsformat))
src/modules/graphics/metal/Texture.mm
+1 -1
View File
@@ -62,7 +62,7 @@ Texture::Texture(love::graphics::Graphics *gfx, id<MTLDevice> device, const Sett
{ {
// We already don't really support metal on older systems, this just // We already don't really support metal on older systems, this just
// silences a compiler warning about it. // silences a compiler warning about it.
auto formatdesc = Metal::convertPixelFormat(format, sRGB); auto formatdesc = Metal::convertPixelFormat(device, format, sRGB);
desc.pixelFormat = formatdesc.format; desc.pixelFormat = formatdesc.format;
if (formatdesc.swizzled) if (formatdesc.swizzled)
desc.swizzle = formatdesc.swizzle; desc.swizzle = formatdesc.swizzle;