Skip to content
Permalink
Browse files

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.
  • Loading branch information...
stenzek committed Mar 9, 2019
1 parent 5732769 commit e9cfcf4632a243de99f583a915321cc98b6bd39a
Showing with 9 additions and 1 deletion.
  1. +9 −1 Source/Core/VideoCommon/ShaderCache.cpp
@@ -970,6 +970,12 @@ void ShaderCache::QueueUberShaderPipelines()
static_cast<PrimitiveType>(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);
});
});
});

0 comments on commit e9cfcf4

Please sign in to comment.
You can’t perform that action at this time.