Merge pull request #6965 from stenzek/d3d-feature-level-10

D3D: Don't emit uint outputs when logic op is unsupported

1 files changed, 5 insertions, 3 deletions

diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp
index aae881a0f1..da648b3ba6 100644
--- a/Source/Core/VideoCommon/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/PixelShaderGen.cpp
@@ -338,13 +338,15 @@ PixelShaderUid GetPixelShaderUid()
   return out;
 }
 
-void ClearUnusedPixelShaderUidBits(APIType ApiType, PixelShaderUid* uid)
+void ClearUnusedPixelShaderUidBits(APIType ApiType, const ShaderHostConfig& host_config,
+                                   PixelShaderUid* uid)
 {
   pixel_shader_uid_data* uid_data = uid->GetUidData<pixel_shader_uid_data>();
 
   // OpenGL and Vulkan convert implicitly normalized color outputs to their uint representation.
-  // Therefore, it is not necessary to use a uint output on these backends.
-  if (ApiType != APIType::D3D)
+  // Therefore, it is not necessary to use a uint output on these backends. We also disable the
+  // uint output when logic op is not supported (i.e. driver/device does not support D3D11.1).
+  if (ApiType != APIType::D3D || !host_config.backend_logic_op)
     uid_data->uint_output = 0;
 }