summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends
diff options
context:
space:
mode:
authorStenzek <stenzek@gmail.com>2016-03-06 18:45:57 +1000
committerStenzek <stenzek@gmail.com>2016-05-08 12:08:25 +1000
commit3372bfa6ab72c38763ed5b37dcb0fe6a9068a7eb (patch)
treec77882bd037c6a04c7ea5f5340c2e35069ac9f7a /Source/Core/VideoBackends
parent063761fbd287c1dd05e022c5369a07747156eb70 (diff)
D3D12: Remove feature level checks
We don't create a device below feature level 11_0 anyway, so no point checking, we can just assume support.
Diffstat (limited to 'Source/Core/VideoBackends')
-rw-r--r--Source/Core/VideoBackends/D3D12/BoundingBox.cpp6
-rw-r--r--Source/Core/VideoBackends/D3D12/D3DBase.h1
-rw-r--r--Source/Core/VideoBackends/D3D12/D3DCommandListManager.h2
-rw-r--r--Source/Core/VideoBackends/D3D12/main.cpp10
4 files changed, 5 insertions, 14 deletions
diff --git a/Source/Core/VideoBackends/D3D12/BoundingBox.cpp b/Source/Core/VideoBackends/D3D12/BoundingBox.cpp
index 8e64d2a16e..197ab2bdaa 100644
--- a/Source/Core/VideoBackends/D3D12/BoundingBox.cpp
+++ b/Source/Core/VideoBackends/D3D12/BoundingBox.cpp
@@ -30,9 +30,6 @@ static D3D12_GPU_DESCRIPTOR_HANDLE s_bbox_descriptor_handle;
void BBox::Init()
{
- if (!g_ActiveConfig.backend_info.bSupportsBBox)
- return;
-
CD3DX12_RESOURCE_DESC buffer_desc(CD3DX12_RESOURCE_DESC::Buffer(BBOX_BUFFER_SIZE, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, 0));
CD3DX12_RESOURCE_DESC staging_buffer_desc(CD3DX12_RESOURCE_DESC::Buffer(BBOX_BUFFER_SIZE, D3D12_RESOURCE_FLAG_NONE, 0));
@@ -73,8 +70,7 @@ void BBox::Init()
void BBox::Bind()
{
- if (s_bbox_buffer)
- D3D::current_command_list->SetGraphicsRootDescriptorTable(DESCRIPTOR_TABLE_PS_UAV, s_bbox_descriptor_handle);
+ D3D::current_command_list->SetGraphicsRootDescriptorTable(DESCRIPTOR_TABLE_PS_UAV, s_bbox_descriptor_handle);
}
void BBox::Invalidate()
diff --git a/Source/Core/VideoBackends/D3D12/D3DBase.h b/Source/Core/VideoBackends/D3D12/D3DBase.h
index 7f321121f9..944edfeb3a 100644
--- a/Source/Core/VideoBackends/D3D12/D3DBase.h
+++ b/Source/Core/VideoBackends/D3D12/D3DBase.h
@@ -66,7 +66,6 @@ void UnloadDXGI();
void UnloadD3D();
void UnloadD3DCompiler();
-D3D_FEATURE_LEVEL GetFeatureLevel(IDXGIAdapter* adapter);
std::vector<DXGI_SAMPLE_DESC> EnumAAModes(IDXGIAdapter* adapter);
bool AlertUserIfSelectedAdapterDoesNotSupportD3D12();
diff --git a/Source/Core/VideoBackends/D3D12/D3DCommandListManager.h b/Source/Core/VideoBackends/D3D12/D3DCommandListManager.h
index f404a8a0ac..2629cd2333 100644
--- a/Source/Core/VideoBackends/D3D12/D3DCommandListManager.h
+++ b/Source/Core/VideoBackends/D3D12/D3DCommandListManager.h
@@ -90,8 +90,6 @@ private:
ID3D12GraphicsCommandList* m_backing_command_list;
ID3D12QueuedCommandList* m_queued_command_list;
- ID3D12RootSignature* m_default_root_signature;
-
UINT m_current_deferred_destruction_list;
std::array<std::vector<ID3D12Resource*>, 2> m_deferred_destruction_lists;
std::array<UINT64, 2> m_deferred_destruction_list_fences;
diff --git a/Source/Core/VideoBackends/D3D12/main.cpp b/Source/Core/VideoBackends/D3D12/main.cpp
index 636723458a..1f75854a33 100644
--- a/Source/Core/VideoBackends/D3D12/main.cpp
+++ b/Source/Core/VideoBackends/D3D12/main.cpp
@@ -110,19 +110,17 @@ void InitBackendInfo()
g_Config.backend_info.AAModes.push_back(modes[i].Count);
}
- bool shader_model_5_supported = (DX12::D3D::GetFeatureLevel(ad) >= D3D_FEATURE_LEVEL_11_0);
-
// Requires the earlydepthstencil attribute (only available in shader model 5)
- g_Config.backend_info.bSupportsEarlyZ = shader_model_5_supported;
+ g_Config.backend_info.bSupportsEarlyZ = true;
// Requires full UAV functionality (only available in shader model 5)
- g_Config.backend_info.bSupportsBBox = shader_model_5_supported;
+ g_Config.backend_info.bSupportsBBox = true;
// Requires the instance attribute (only available in shader model 5)
- g_Config.backend_info.bSupportsGSInstancing = shader_model_5_supported;
+ g_Config.backend_info.bSupportsGSInstancing = true;
// Sample shading requires shader model 5
- g_Config.backend_info.bSupportsSSAA = shader_model_5_supported;
+ g_Config.backend_info.bSupportsSSAA = true;
}
g_Config.backend_info.Adapters.push_back(UTF16ToUTF8(desc.Description));
ad->Release();