From 08806070cae5cf39cbb9b1d5a318c4e3ea047b1b Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Wed, 21 Mar 2018 15:08:17 +0100
Subject: [PATCH] [d3d11] Fix CheckFeatureSupport return value

---
 src/d3d11/d3d11_device.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp
index 352bf2e17..35c99132c 100644
--- a/src/d3d11/d3d11_device.cpp
+++ b/src/d3d11/d3d11_device.cpp
@@ -1410,8 +1410,10 @@ namespace dxvk {
         
         // TODO implement, most of these are required for FL 11.1
         // https://msdn.microsoft.com/en-us/library/windows/desktop/hh404457(v=vs.85).aspx
+        const VkPhysicalDeviceFeatures& features = m_dxvkDevice->features();
+        
         auto info = static_cast<D3D11_FEATURE_DATA_D3D11_OPTIONS*>(pFeatureSupportData);
-        info->OutputMergerLogicOp                     = m_featureLevel >= D3D_FEATURE_LEVEL_10_0;
+        info->OutputMergerLogicOp                     = features.logicOp;
         info->UAVOnlyRenderingForcedSampleCount       = FALSE;
         info->DiscardAPIsSeenByDriver                 = FALSE;
         info->FlagsForUpdateAndCopySeenByDriver       = FALSE;
@@ -1458,7 +1460,7 @@ namespace dxvk {
         Logger::err(str::format(
           "D3D11Device: CheckFeatureSupport: Unknown feature: ",
           Feature));
-        return E_INVALIDARG;
+        return E_NOTIMPL;
     }
   }