From d6d6ed4efd8e16dbf5a5698c575c02770a28ad36 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Sun, 18 Mar 2018 23:39:40 +0100 Subject: [PATCH] [d3d11] Expose Feature Level 11_1 if explicitly requested Not enabled by default since some 11_1 functionality is not yet implemented. --- src/d3d11/d3d11_device.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp index 41eecff96..968f28837 100644 --- a/src/d3d11/d3d11_device.cpp +++ b/src/d3d11/d3d11_device.cpp @@ -1601,7 +1601,6 @@ namespace dxvk { enabled.logicOp = supported.logicOp; enabled.shaderImageGatherExtended = VK_TRUE; enabled.textureCompressionBC = VK_TRUE; - enabled.vertexPipelineStoresAndAtomics = VK_TRUE; } if (featureLevel >= D3D_FEATURE_LEVEL_10_1) { @@ -1617,6 +1616,11 @@ namespace dxvk { enabled.shaderStorageImageWriteWithoutFormat = VK_TRUE; } + if (featureLevel >= D3D_FEATURE_LEVEL_11_1) { + enabled.logicOp = VK_TRUE; + enabled.vertexPipelineStoresAndAtomics = VK_TRUE; + } + return enabled; } @@ -1872,7 +1876,8 @@ namespace dxvk { D3D_FEATURE_LEVEL D3D11Device::GetMaxFeatureLevel() { - static const std::array, 6> s_featureLevels = {{ + static const std::array, 7> s_featureLevels = {{ + { "11_1", D3D_FEATURE_LEVEL_11_1 }, { "11_0", D3D_FEATURE_LEVEL_11_0 }, { "10_1", D3D_FEATURE_LEVEL_10_1 }, { "10_0", D3D_FEATURE_LEVEL_10_0 }, @@ -1891,7 +1896,6 @@ namespace dxvk { return entry != s_featureLevels.end() ? entry->second : D3D_FEATURE_LEVEL_11_0; - } }