ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VideoBackends:Metal: Create samplers on demand

This commit is contained in:
TellowKrinkle 2022-06-13 00:56:25 -05:00
parent 61705b05da
commit e32213d031
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/VideoBackends/Metal/MTLObjectCache.h
View File

@ -76,13 +76,19 @@ public:
id<MTLDepthStencilState> GetDepthStencil(DepthStencilSelector sel) { return m_dss[sel.value]; } id<MTLDepthStencilState> GetDepthStencil(DepthStencilSelector sel) { return m_dss[sel.value]; }
id<MTLSamplerState> GetSampler(SamplerSelector sel) { return m_samplers[sel.value]; } id<MTLSamplerState> GetSampler(SamplerSelector sel)
{
if (__builtin_expect(!m_samplers[sel.value], false))
m_samplers[sel.value] = CreateSampler(sel);
return m_samplers[sel.value];
}
id<MTLSamplerState> GetSampler(SamplerState state) { return GetSampler(SamplerSelector(state)); } id<MTLSamplerState> GetSampler(SamplerState state) { return GetSampler(SamplerSelector(state)); }
void ReloadSamplers(); void ReloadSamplers();
private: private:
MRCOwned<id<MTLSamplerState>> CreateSampler(SamplerSelector sel);
MRCOwned<id<MTLDepthStencilState>> m_dss[DepthStencilSelector::N_VALUES]; MRCOwned<id<MTLDepthStencilState>> m_dss[DepthStencilSelector::N_VALUES];
MRCOwned<id<MTLSamplerState>> m_samplers[SamplerSelector::N_VALUES]; MRCOwned<id<MTLSamplerState>> m_samplers[SamplerSelector::N_VALUES];
}; };

15
Source/Core/VideoBackends/Metal/MTLObjectCache.mm
View File

@ -11,12 +11,10 @@ std::unique_ptr<Metal::ObjectCache> Metal::g_object_cache;
static void SetupDepthStencil( static void SetupDepthStencil(
MRCOwned<id<MTLDepthStencilState>> (&dss)[Metal::DepthStencilSelector::N_VALUES]); MRCOwned<id<MTLDepthStencilState>> (&dss)[Metal::DepthStencilSelector::N_VALUES]);
static void SetupSamplers(MRCOwned<id<MTLSamplerState>> (&samplers)[Metal::SamplerSelector::N_VALUES]);
Metal::ObjectCache::ObjectCache() Metal::ObjectCache::ObjectCache()
{ {
SetupDepthStencil(m_dss); SetupDepthStencil(m_dss);
SetupSamplers(m_samplers);
} }
Metal::ObjectCache::~ObjectCache() Metal::ObjectCache::~ObjectCache()
@ -147,13 +145,11 @@ static const char* to_string(WrapMode wrap)
// clang-format on // clang-format on
static void SetupSamplers(MRCOwned<id<MTLSamplerState>> (&samplers)[Metal::SamplerSelector::N_VALUES]) MRCOwned<id<MTLSamplerState>> Metal::ObjectCache::CreateSampler(SamplerSelector sel)
{ {
auto desc = MRCTransfer([MTLSamplerDescriptor new]); @autoreleasepool
Metal::SamplerSelector sel;
for (size_t i = 0; i < std::size(samplers); i++)
{ {
sel.value = i; auto desc = MRCTransfer([MTLSamplerDescriptor new]);
[desc setMinFilter:ConvertMinMag(sel.MinFilter())]; [desc setMinFilter:ConvertMinMag(sel.MinFilter())];
[desc setMagFilter:ConvertMinMag(sel.MagFilter())]; [desc setMagFilter:ConvertMinMag(sel.MagFilter())];
[desc setMipFilter:ConvertMip(sel.MipFilter())]; [desc setMipFilter:ConvertMip(sel.MipFilter())];
@ -165,11 +161,12 @@ static void SetupSamplers(MRCOwned<id<MTLSamplerState>> (&samplers)[Metal::Sampl
to_string(sel.MagFilter()), to_string(sel.MipFilter()), to_string(sel.MagFilter()), to_string(sel.MipFilter()),
to_string(sel.WrapU()), to_string(sel.WrapV()), to_string(sel.WrapU()), to_string(sel.WrapV()),
sel.AnisotropicFiltering() ? "(AF)" : ""])]; sel.AnisotropicFiltering() ? "(AF)" : ""])];
samplers[i] = MRCTransfer([Metal::g_device newSamplerStateWithDescriptor:desc]); return MRCTransfer([Metal::g_device newSamplerStateWithDescriptor:desc]);
} }
} }
void Metal::ObjectCache::ReloadSamplers() void Metal::ObjectCache::ReloadSamplers()
{ {
SetupSamplers(m_samplers); for (auto& sampler : m_samplers)
sampler = nullptr;
} }