From 4fc96e60c5faac76602b6fb1001c7f36566330d0 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Sat, 2 Mar 2019 09:05:32 +0100 Subject: [PATCH] [d3d11] Reimplment GetEnabledShaderStages using getShaderPipelineStages They do the same thing anyway. --- src/d3d11/d3d11_device.cpp | 18 ------------------ src/d3d11/d3d11_device.h | 4 +++- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp index 1405cfab3..fdac2f3c4 100644 --- a/src/d3d11/d3d11_device.cpp +++ b/src/d3d11/d3d11_device.cpp @@ -1331,24 +1331,6 @@ namespace dxvk { } - VkPipelineStageFlags D3D11Device::GetEnabledShaderStages() const { - VkPipelineStageFlags enabledShaderPipelineStages - = VK_PIPELINE_STAGE_VERTEX_SHADER_BIT - | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT - | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT; - - if (m_dxvkDevice->features().core.features.geometryShader) - enabledShaderPipelineStages |= VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT; - - if (m_dxvkDevice->features().core.features.tessellationShader) { - enabledShaderPipelineStages |= VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT - | VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT; - } - - return enabledShaderPipelineStages; - } - - bool D3D11Device::CheckFeatureLevelSupport( const Rc& adapter, D3D_FEATURE_LEVEL featureLevel) { diff --git a/src/d3d11/d3d11_device.h b/src/d3d11/d3d11_device.h index 7d0daf62a..7f4c75c49 100644 --- a/src/d3d11/d3d11_device.h +++ b/src/d3d11/d3d11_device.h @@ -295,7 +295,9 @@ namespace dxvk { void FlushInitContext(); - VkPipelineStageFlags GetEnabledShaderStages() const; + VkPipelineStageFlags GetEnabledShaderStages() const { + return m_dxvkDevice->getShaderPipelineStages(); + } DXGI_VK_FORMAT_INFO LookupFormat( DXGI_FORMAT Format,