Merge pull request #6026 from stenzek/d3d-ubershader-logicop

ShaderGen: Output uint when logic op is enabled for D3D ubershaders

3 files changed, 8 insertions, 1 deletions

diff --git a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
index 07270f0e2a..326f840db1 100644
--- a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
+++ b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
@@ -593,6 +593,7 @@ bool PixelShaderCache::SetShader()
     return SetUberShader();
 
   PixelShaderUid uid = GetPixelShaderUid();
+  ClearUnusedPixelShaderUidBits(APIType::D3D, &uid);
   if (last_entry && uid == last_uid)
   {
     if (last_entry->pending)
@@ -656,6 +657,7 @@ bool PixelShaderCache::SetShader()
 bool PixelShaderCache::SetUberShader()
 {
   UberShader::PixelShaderUid uid = UberShader::GetPixelShaderUid();
+  UberShader::ClearUnusedPixelShaderUidBits(APIType::D3D, &uid);
 
   if (last_uber_entry && last_uber_uid == uid)
   {
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
index 6e91717ed5..5617a928a9 100644
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
@@ -231,6 +231,7 @@ SHADER* ProgramShaderCache::SetShader(u32 primitive_type, const GLVertexFormat*
   uid.puid = GetPixelShaderUid();
   uid.vuid = GetVertexShaderUid();
   uid.guid = GetGeometryShaderUid(primitive_type);
+  ClearUnusedPixelShaderUidBits(APIType::OpenGL, &uid.puid);
 
   // Check if the shader is already set
   if (last_entry && uid == last_uid)
@@ -298,6 +299,7 @@ SHADER* ProgramShaderCache::SetUberShader(u32 primitive_type, const GLVertexForm
   uid.puid = UberShader::GetPixelShaderUid();
   uid.vuid = UberShader::GetVertexShaderUid();
   uid.guid = GetGeometryShaderUid(primitive_type);
+  UberShader::ClearUnusedPixelShaderUidBits(APIType::OpenGL, &uid.puid);
 
   // We need to use the ubershader vertex format with all attributes enabled.
   // Otherwise, the NV driver can generate variants for the vertex shaders.
diff --git a/Source/Core/VideoBackends/Vulkan/StateTracker.cpp b/Source/Core/VideoBackends/Vulkan/StateTracker.cpp
index 33baa86c4c..ae583374e8 100644
--- a/Source/Core/VideoBackends/Vulkan/StateTracker.cpp
+++ b/Source/Core/VideoBackends/Vulkan/StateTracker.cpp
@@ -338,8 +338,9 @@ bool StateTracker::CheckForShaderChanges(u32 gx_primitive_type)
 {
   VertexShaderUid vs_uid = GetVertexShaderUid();
   PixelShaderUid ps_uid = GetPixelShaderUid();
-  bool changed = false;
+  ClearUnusedPixelShaderUidBits(APIType::Vulkan, &ps_uid);
 
+  bool changed = false;
   bool use_ubershaders = g_ActiveConfig.bDisableSpecializedShaders;
   if (g_ActiveConfig.CanBackgroundCompileShaders() && !g_ActiveConfig.bDisableSpecializedShaders)
   {
@@ -405,6 +406,7 @@ bool StateTracker::CheckForShaderChanges(u32 gx_primitive_type)
     }
 
     UberShader::PixelShaderUid uber_ps_uid = UberShader::GetPixelShaderUid();
+    UberShader::ClearUnusedPixelShaderUidBits(APIType::Vulkan, &uber_ps_uid);
     VkShaderModule ps = g_shader_cache->GetPixelUberShaderForUid(uber_ps_uid);
     if (ps != m_pipeline_state.ps)
     {
@@ -983,6 +985,7 @@ VkPipeline StateTracker::GetPipelineAndCacheUID()
     PipelineInfo uber_info = m_pipeline_state;
     UberShader::VertexShaderUid uber_vuid = UberShader::GetVertexShaderUid();
     UberShader::PixelShaderUid uber_puid = UberShader::GetPixelShaderUid();
+    UberShader::ClearUnusedPixelShaderUidBits(APIType::Vulkan, &uber_puid);
     uber_info.vs = g_shader_cache->GetVertexUberShaderForUid(uber_vuid);
     uber_info.ps = g_shader_cache->GetPixelUberShaderForUid(uber_puid);