Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Metal: enable mipmap support (#2235)

This commit is contained in:
smilediver 2024-11-15 17:12:02 +02:00 committed by GitHub
parent f03efb8cf7
commit 502961dcc5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/renderer/backend/Types.h
View File

@ -46,6 +46,9 @@ inline TargetBufferFlags getMRTColorFlag(size_t index) noexcept
typedef TargetBufferFlags ClearFlag;
/// @note In Metal, mipmap filter is derived from `magFilter` value: ie `NEAREST_MIPMAP_LINEAR` and
/// `LINEAR_MIPMAP_LINEAR` will select `LINEAR` filter, while `NEAREST_MIPMAP_NEAREST` and
/// `LINEAR_MIPMAP_NEAREST` will select `NEAREST` filter.
struct SamplerDescriptor
{
SamplerFilter magFilter = SamplerFilter::LINEAR;

23
core/renderer/backend/metal/TextureMTL.mm
View File

@ -32,7 +32,7 @@ NS_AX_BACKEND_BEGIN
namespace
{
MTLSamplerAddressMode toMTLSamplerAddressMode(SamplerAddressMode mode)
static MTLSamplerAddressMode toMTLSamplerAddressMode(SamplerAddressMode mode)
{
MTLSamplerAddressMode ret = MTLSamplerAddressModeRepeat;
switch (mode)
@ -53,7 +53,7 @@ MTLSamplerAddressMode toMTLSamplerAddressMode(SamplerAddressMode mode)
return ret;
}
MTLSamplerMinMagFilter toMTLSamplerMinMagFilter(SamplerFilter mode)
static MTLSamplerMinMagFilter toMTLSamplerMinMagFilter(SamplerFilter mode)
{
switch (mode)
{
@ -70,7 +70,22 @@ MTLSamplerMinMagFilter toMTLSamplerMinMagFilter(SamplerFilter mode)
}
}
bool isColorRenderable(PixelFormat textureFormat)
static MTLSamplerMipFilter toMTLSamplerMipFilter(SamplerFilter mode)
{
switch (mode)
{
case SamplerFilter::NEAREST_MIPMAP_LINEAR:
case SamplerFilter::LINEAR_MIPMAP_LINEAR:
return MTLSamplerMipFilterLinear;
case SamplerFilter::NEAREST_MIPMAP_NEAREST:
case SamplerFilter::LINEAR_MIPMAP_NEAREST:
return MTLSamplerMipFilterNearest;
default:
return MTLSamplerMipFilterNotMipmapped;
}
}
static bool isColorRenderable(PixelFormat textureFormat)
{
switch (textureFormat)
{
@ -168,6 +183,8 @@ void TextureInfoMTL::recreateSampler(const SamplerDescriptor& descriptor)
descriptor.minFilter == SamplerFilter::DONT_CARE ? _minFilter : toMTLSamplerMinMagFilter(descriptor.minFilter);
mtlDescriptor.magFilter =
descriptor.magFilter == SamplerFilter::DONT_CARE ? _magFilter : toMTLSamplerMinMagFilter(descriptor.magFilter);
mtlDescriptor.mipFilter =
descriptor.magFilter == SamplerFilter::DONT_CARE ? _mipFilter : toMTLSamplerMipFilter(descriptor.magFilter);
if (_mtlSamplerState)
{