diff options
| author | Anthony Serna <aserna3@gmail.com> | 2015-09-14 18:49:48 -0700 |
|---|---|---|
| committer | Anthony Serna <aserna3@gmail.com> | 2015-09-25 09:05:18 -0700 |
| commit | df189c3ea3aa7d17a5a69ecd8497a64c6aefec43 (patch) | |
| tree | 563c307f4380f77171fd20390f94a23420a3c43d /Source/Core/VideoBackends | |
| parent | 45c1cfa078cdcd58b5592917a7102e647e841f6a (diff) | |
Improved D3D and OGL AA option UI
Removed Quality Levels from D3D AA options
Dropdown text now shows whether you're applying MSAA or SSAA
Added a description for SSAA
Moved SSAA checkbox
Cleaned up AA in backends slightly. Supported modes is now a list of ints.
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/D3DBase.cpp | 12 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/D3D/main.cpp | 10 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/main.cpp | 6 |
3 files changed, 11 insertions, 17 deletions
diff --git a/Source/Core/VideoBackends/D3D/D3DBase.cpp b/Source/Core/VideoBackends/D3D/D3DBase.cpp index 8439f95ef6..07d5888ee6 100644 --- a/Source/Core/VideoBackends/D3D/D3DBase.cpp +++ b/Source/Core/VideoBackends/D3D/D3DBase.cpp @@ -178,13 +178,13 @@ std::vector<DXGI_SAMPLE_DESC> EnumAAModes(IDXGIAdapter* adapter) { UINT quality_levels = 0; _device->CheckMultisampleQualityLevels(DXGI_FORMAT_R8G8B8A8_UNORM, samples, &quality_levels); + + DXGI_SAMPLE_DESC desc; + desc.Count = samples; + desc.Quality = 0; + if (quality_levels > 0) - { - DXGI_SAMPLE_DESC desc; - desc.Count = samples; - for (desc.Quality = 0; desc.Quality < quality_levels; ++desc.Quality) - _aa_modes.push_back(desc); - } + _aa_modes.push_back(desc); } _context->Release(); _device->Release(); diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp index 66d23116fd..98ed5e60ea 100644 --- a/Source/Core/VideoBackends/D3D/main.cpp +++ b/Source/Core/VideoBackends/D3D/main.cpp @@ -106,16 +106,10 @@ void InitBackendInfo() { std::string samples; std::vector<DXGI_SAMPLE_DESC> modes = DX11::D3D::EnumAAModes(ad); + // First iteration will be 1. This equals no AA. for (unsigned int i = 0; i < modes.size(); ++i) { - if (i == 0) - samples = _trans("None"); - else if (modes[i].Quality) - samples = StringFromFormat(_trans("%d samples (quality level %d)"), modes[i].Count, modes[i].Quality); - else - samples = StringFromFormat(_trans("%d samples"), modes[i].Count); - - g_Config.backend_info.AAModes.push_back(samples); + g_Config.backend_info.AAModes.push_back(modes[i].Count); } bool shader_model_5_supported = (DX11::D3D::GetFeatureLevel(ad) >= D3D_FEATURE_LEVEL_11_0); diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index 1b4ae331b6..a706e27533 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -121,9 +121,9 @@ static void InitBackendInfo() g_Config.backend_info.Adapters.clear(); - // aamodes - const char* caamodes[] = {_trans("None"), "2x MSAA", "4x MSAA", "8x MSAA"}; - g_Config.backend_info.AAModes.assign(caamodes, caamodes + sizeof(caamodes)/sizeof(*caamodes)); + // aamodes - 1 is to stay consistent with D3D (means no AA) + const int aamodes[] = { 1, 2, 4, 8 }; + g_Config.backend_info.AAModes.assign(aamodes, aamodes + sizeof(aamodes)/sizeof(*aamodes)); // pp shaders g_Config.backend_info.PPShaders = GetShaders(""); |