From e9cfcf4632a243de99f583a915321cc98b6bd39a Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 9 Mar 2019 23:31:31 +1000 Subject: [PATCH] ShaderCache: Don't create invalid logic op pipelines uint_output will never be set unless logic ops are enabled. Also clears the bits so we're not compiling unused pixel shaders on the other backends. --- Source/Core/VideoCommon/ShaderCache.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/ShaderCache.cpp b/Source/Core/VideoCommon/ShaderCache.cpp index eee7120fbe..8f9c99d39d 100644 --- a/Source/Core/VideoCommon/ShaderCache.cpp +++ b/Source/Core/VideoCommon/ShaderCache.cpp @@ -970,6 +970,12 @@ void ShaderCache::QueueUberShaderPipelines() static_cast(gs_uid.GetUidData()->primitive_type)); config.depth_state = RenderState::GetNoDepthTestingDepthState(); config.blending_state = RenderState::GetNoBlendingBlendState(); + if (ps_uid.GetUidData()->uint_output) + { + // uint_output is only ever enabled when logic ops are enabled. + config.blending_state.logicopenable = true; + config.blending_state.logicmode = BlendMode::AND; + } auto iter = m_gx_uber_pipeline_cache.find(config); if (iter != m_gx_uber_pipeline_cache.end()) @@ -986,13 +992,15 @@ void ShaderCache::QueueUberShaderPipelines() if (vuid.GetUidData()->num_texgens != puid.GetUidData()->num_texgens) return; + UberShader::PixelShaderUid cleared_puid = puid; + UberShader::ClearUnusedPixelShaderUidBits(m_api_type, m_host_config, &cleared_puid); EnumerateGeometryShaderUids([&](const GeometryShaderUid& guid) { if (guid.GetUidData()->numTexGens != vuid.GetUidData()->num_texgens || (!guid.GetUidData()->IsPassthrough() && !m_host_config.backend_geometry_shaders)) { return; } - QueueDummyPipeline(vuid, guid, puid); + QueueDummyPipeline(vuid, guid, cleared_puid); }); }); });