summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends
diff options
context:
space:
mode:
authorConnor McLaughlin <stenzek@gmail.com>2019-04-28 17:07:37 +1000
committerGitHub <noreply@github.com>2019-04-28 17:07:37 +1000
commitf7199397a0195f7fb454147b4d68a38235eaab64 (patch)
tree98ea19003c1cabe662ee893ec9787b9461f2b975 /Source/Core/VideoBackends
parent96c69fd0481675c0025065ee9ce43b0a0d0e9605 (diff)
parent025767c9293a8ecf770daef063005491898206f6 (diff)
Merge pull request #8047 from stenzek/d3d-feature-level-10
D3D11: Fix Dolphin crashing on feature level 10.0 devices
Diffstat (limited to 'Source/Core/VideoBackends')
-rw-r--r--Source/Core/VideoBackends/D3D/D3DBase.cpp44
-rw-r--r--Source/Core/VideoBackends/D3D/D3DBase.h3
-rw-r--r--Source/Core/VideoBackends/D3D/main.cpp19
3 files changed, 32 insertions, 34 deletions
diff --git a/Source/Core/VideoBackends/D3D/D3DBase.cpp b/Source/Core/VideoBackends/D3D/D3DBase.cpp
index 0631ded2c0..6ed649263e 100644
--- a/Source/Core/VideoBackends/D3D/D3DBase.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DBase.cpp
@@ -33,29 +33,6 @@ static ComPtr<ID3D11Debug> s_debug;
static constexpr D3D_FEATURE_LEVEL s_supported_feature_levels[] = {
D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_10_1, D3D_FEATURE_LEVEL_10_0};
-static bool SupportsS3TCTextures()
-{
- UINT bc1_support, bc2_support, bc3_support;
- if (FAILED(device->CheckFormatSupport(DXGI_FORMAT_BC1_UNORM, &bc1_support)) ||
- FAILED(device->CheckFormatSupport(DXGI_FORMAT_BC2_UNORM, &bc2_support)) ||
- FAILED(device->CheckFormatSupport(DXGI_FORMAT_BC3_UNORM, &bc3_support)))
- {
- return false;
- }
-
- return ((bc1_support & bc2_support & bc3_support) & D3D11_FORMAT_SUPPORT_TEXTURE2D) != 0;
-}
-
-static bool SupportsBPTCTextures()
-{
- // Currently, we only care about BC7. This could be extended to BC6H in the future.
- UINT bc7_support;
- if (FAILED(device->CheckFormatSupport(DXGI_FORMAT_BC7_UNORM, &bc7_support)))
- return false;
-
- return (bc7_support & D3D11_FORMAT_SUPPORT_TEXTURE2D) != 0;
-}
-
bool Create(u32 adapter_index, bool enable_debug_layer)
{
PFN_D3D11_CREATE_DEVICE d3d11_create_device;
@@ -145,17 +122,6 @@ bool Create(u32 adapter_index, bool enable_debug_layer)
g_Config.backend_info.bSupportsLogicOp = false;
}
- g_Config.backend_info.bSupportsST3CTextures = SupportsS3TCTextures();
- g_Config.backend_info.bSupportsBPTCTextures = SupportsBPTCTextures();
-
- // Features only supported with a FL11.0+ device.
- const bool shader_model_5_supported = feature_level >= D3D_FEATURE_LEVEL_11_0;
- g_Config.backend_info.bSupportsEarlyZ = shader_model_5_supported;
- g_Config.backend_info.bSupportsBBox = shader_model_5_supported;
- g_Config.backend_info.bSupportsFragmentStoresAndAtomics = shader_model_5_supported;
- g_Config.backend_info.bSupportsGSInstancing = shader_model_5_supported;
- g_Config.backend_info.bSupportsSSAA = shader_model_5_supported;
-
stateman = std::make_unique<StateManager>();
return true;
}
@@ -241,6 +207,16 @@ std::vector<u32> GetAAModes(u32 adapter_index)
return aa_modes;
}
+
+bool SupportsTextureFormat(DXGI_FORMAT format)
+{
+ UINT support;
+ if (FAILED(device->CheckFormatSupport(format, &support)))
+ return false;
+
+ return (support & D3D11_FORMAT_SUPPORT_TEXTURE2D) != 0;
+}
+
} // namespace D3D
} // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/D3DBase.h b/Source/Core/VideoBackends/D3D/D3DBase.h
index 5c92c9b18f..2afaf120e0 100644
--- a/Source/Core/VideoBackends/D3D/D3DBase.h
+++ b/Source/Core/VideoBackends/D3D/D3DBase.h
@@ -40,6 +40,9 @@ void Destroy();
// Returns a list of supported AA modes for the current device.
std::vector<u32> GetAAModes(u32 adapter_index);
+// Checks for support of the given texture format.
+bool SupportsTextureFormat(DXGI_FORMAT format);
+
} // namespace D3D
} // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp
index d22b34c99a..d87965deff 100644
--- a/Source/Core/VideoBackends/D3D/main.cpp
+++ b/Source/Core/VideoBackends/D3D/main.cpp
@@ -87,6 +87,25 @@ void VideoBackend::FillBackendInfo()
g_Config.backend_info.Adapters = D3DCommon::GetAdapterNames();
g_Config.backend_info.AAModes = D3D::GetAAModes(g_Config.iAdapter);
+
+ // Override optional features if we are actually booting.
+ if (D3D::device)
+ {
+ g_Config.backend_info.bSupportsST3CTextures =
+ D3D::SupportsTextureFormat(DXGI_FORMAT_BC1_UNORM) &&
+ D3D::SupportsTextureFormat(DXGI_FORMAT_BC2_UNORM) &&
+ D3D::SupportsTextureFormat(DXGI_FORMAT_BC3_UNORM);
+ g_Config.backend_info.bSupportsBPTCTextures = D3D::SupportsTextureFormat(DXGI_FORMAT_BC7_UNORM);
+
+ // Features only supported with a FL11.0+ device.
+ const bool shader_model_5_supported = D3D::feature_level >= D3D_FEATURE_LEVEL_11_0;
+ g_Config.backend_info.bSupportsEarlyZ = shader_model_5_supported;
+ g_Config.backend_info.bSupportsBBox = shader_model_5_supported;
+ g_Config.backend_info.bSupportsFragmentStoresAndAtomics = shader_model_5_supported;
+ g_Config.backend_info.bSupportsGSInstancing = shader_model_5_supported;
+ g_Config.backend_info.bSupportsSSAA = shader_model_5_supported;
+ g_Config.backend_info.bSupportsGPUTextureDecoding = shader_model_5_supported;
+ }
}
bool VideoBackend::Initialize(const WindowSystemInfo& wsi)