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

D3D11: Correctly poll ALL possible AA levels.

This commit is contained in:
Silent 2019-07-21 12:03:49 +02:00
parent 890f781cd0
commit 88db577c17
No known key found for this signature in database
GPG Key ID: AE53149BB0C45AF1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/VideoBackends/D3D/D3DBase.cpp
View File

@ -171,6 +171,7 @@ std::vector<u32> GetAAModes(u32 adapter_index)
// Use temporary device if we don't have one already. // Use temporary device if we don't have one already.
Common::DynamicLibrary temp_lib; Common::DynamicLibrary temp_lib;
ComPtr<ID3D11Device> temp_device = device; ComPtr<ID3D11Device> temp_device = device;
D3D_FEATURE_LEVEL temp_feature_level = feature_level;
if (!temp_device) if (!temp_device)
{ {
ComPtr<IDXGIFactory> temp_dxgi_factory = D3DCommon::CreateDXGIFactory(false); ComPtr<IDXGIFactory> temp_dxgi_factory = D3DCommon::CreateDXGIFactory(false);
@ -178,7 +179,7 @@ std::vector<u32> GetAAModes(u32 adapter_index)
return {}; return {};
ComPtr<IDXGIAdapter> adapter; ComPtr<IDXGIAdapter> adapter;
temp_dxgi_factory->EnumAdapters(adapter_index, &adapter); temp_dxgi_factory->EnumAdapters(adapter_index, adapter.GetAddressOf());
PFN_D3D11_CREATE_DEVICE d3d11_create_device; PFN_D3D11_CREATE_DEVICE d3d11_create_device;
if (!temp_lib.Open("d3d11.dll") || if (!temp_lib.Open("d3d11.dll") ||
@ -187,21 +188,21 @@ std::vector<u32> GetAAModes(u32 adapter_index)
return {}; return {};
} }
HRESULT hr = d3d11_create_device(nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr, 0, HRESULT hr = d3d11_create_device(
s_supported_feature_levels.data(), adapter.Get(), D3D_DRIVER_TYPE_UNKNOWN, nullptr, 0, s_supported_feature_levels.data(),
static_cast<UINT>(s_supported_feature_levels.size()), static_cast<UINT>(s_supported_feature_levels.size()), D3D11_SDK_VERSION,
D3D11_SDK_VERSION, &temp_device, nullptr, nullptr); temp_device.GetAddressOf(), &temp_feature_level, nullptr);
if (FAILED(hr)) if (FAILED(hr))
return {}; return {};
} }
// NOTE: D3D 10.0 doesn't support multisampled resources which are bound as depth buffers AND // NOTE: D3D 10.0 doesn't support multisampled resources which are bound as depth buffers AND
// shader resources. Thus, we can't have MSAA with 10.0 level hardware. // shader resources. Thus, we can't have MSAA with 10.0 level hardware.
if (temp_device->GetFeatureLevel() == D3D_FEATURE_LEVEL_10_0) if (temp_feature_level == D3D_FEATURE_LEVEL_10_0)
return {}; return {};
std::vector<u32> aa_modes; std::vector<u32> aa_modes;
for (u32 samples = 1; samples < D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT; ++samples) for (u32 samples = 1; samples <= D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT; ++samples)
{ {
UINT quality_levels = 0; UINT quality_levels = 0;
if (SUCCEEDED(temp_device->CheckMultisampleQualityLevels(DXGI_FORMAT_R8G8B8A8_UNORM, samples, if (SUCCEEDED(temp_device->CheckMultisampleQualityLevels(DXGI_FORMAT_R8G8B8A8_UNORM, samples,