raphiaura/KytyPS5
1
0
Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-28 13:56:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reuse pipelines when inactive blend settings change

Browse Source
This commit is contained in:
nmzik
2026-10-01 22:09:59 +04:00
parent f29bd0fe35
commit b86cf0a820
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/host_gpu/renderer/pipeline/pipelineCache.cpp
+11 -7
View File
@@ -714,13 +714,6 @@ PipelineCache::Pipeline& PipelineCache::GetGraphicsPipeline(
} }
const auto& rt = ctx.GetRenderTarget(colors[i].target_slot); const auto& rt = ctx.GetRenderTarget(colors[i].target_slot);
const auto& bc = ctx.GetBlendControl(colors[i].target_slot); const auto& bc = ctx.GetBlendControl(colors[i].target_slot);
static_params.color_srcblend[slot] = bc.color_srcblend;
static_params.color_comb_fcn[slot] = bc.color_comb_fcn;
static_params.color_destblend[slot] = bc.color_destblend;
static_params.alpha_srcblend[slot] = bc.alpha_srcblend;
static_params.alpha_comb_fcn[slot] = bc.alpha_comb_fcn;
static_params.alpha_destblend[slot] = bc.alpha_destblend;
static_params.separate_alpha_blend[slot] = bc.separate_alpha_blend;
const bool alpha_remap = const bool alpha_remap =
slot == 0 && ps_input_info != nullptr && ps_input_info->alpha_blend_source_remap; slot == 0 && ps_input_info != nullptr && ps_input_info->alpha_blend_source_remap;
static_params.blend_enable[slot] = bc.enable && !rt.info.blend_bypass; static_params.blend_enable[slot] = bc.enable && !rt.info.blend_bypass;
@@ -739,6 +732,17 @@ PipelineCache::Pipeline& PipelineCache::GetGraphicsPipeline(
if (alpha_remap) { if (alpha_remap) {
static_params.blend_alpha_source_remap = true; static_params.blend_alpha_source_remap = true;
} }
if (static_params.blend_enable[slot]) {
static_params.color_srcblend[slot] = bc.color_srcblend;
static_params.color_comb_fcn[slot] = bc.color_comb_fcn;
static_params.color_destblend[slot] = bc.color_destblend;
static_params.separate_alpha_blend[slot] = bc.separate_alpha_blend;
if (bc.separate_alpha_blend) {
static_params.alpha_srcblend[slot] = bc.alpha_srcblend;
static_params.alpha_comb_fcn[slot] = bc.alpha_comb_fcn;
static_params.alpha_destblend[slot] = bc.alpha_destblend;
}
}
} }
const bool with_depth = const bool with_depth =
depth.desc.view_info.format != vk::Format::eUndefined && static_cast<bool>(depth.image_id); depth.desc.view_info.format != vk::Format::eUndefined && static_cast<bool>(depth.image_id);
tests/ShaderRecompilerComputeTests.cpp
+15 -4
View File
@@ -14507,11 +14507,14 @@ public:
"last-vertex flat shading changed coverage or did not use vertex two"); "last-vertex flat shading changed coverage or did not use vertex two");
} }
const auto blend_pipeline = [&](bool enabled, bool bypass) -> PipelineCache::Pipeline & { const auto blend_pipeline = [&](bool enabled, bool bypass,
bool alternate = false) -> PipelineCache::Pipeline & {
auto blend = registers.GetBlendControl(0); auto blend = registers.GetBlendControl(0);
blend.enable = enabled; blend.enable = enabled;
blend.color_srcblend = static_cast<uint8_t>(Prospero::BlendFactor::kZero); blend.color_srcblend = static_cast<uint8_t>(alternate ? Prospero::BlendFactor::kOne
blend.alpha_srcblend = static_cast<uint8_t>(Prospero::BlendFactor::kZero); : Prospero::BlendFactor::kZero);
blend.alpha_srcblend = blend.color_srcblend;
blend.separate_alpha_blend = alternate;
registers.SetBlendControl(0, blend); registers.SetBlendControl(0, blend);
auto target = registers.GetRenderTarget(0).info; auto target = registers.GetRenderTarget(0).info;
target.blend_bypass = bypass; target.blend_bypass = bypass;
@@ -14521,13 +14524,21 @@ public:
auto &disabled_blend = blend_pipeline(false, false); auto &disabled_blend = blend_pipeline(false, false);
Require(name, "effective blend pipeline cache", Require(name, "effective blend pipeline cache",
blend_pipeline(false, true).pipeline == disabled_blend.pipeline && blend_pipeline(false, true).pipeline == disabled_blend.pipeline &&
blend_pipeline(true, true).pipeline == disabled_blend.pipeline, blend_pipeline(true, true).pipeline == disabled_blend.pipeline &&
blend_pipeline(false, false, true).pipeline == disabled_blend.pipeline &&
blend_pipeline(true, true, true).pipeline == disabled_blend.pipeline,
"disabled and bypassed blending did not share the same host pipeline"); "disabled and bypassed blending did not share the same host pipeline");
auto &enabled_blend = blend_pipeline(true, false); auto &enabled_blend = blend_pipeline(true, false);
Require(name, "enabled blend pipeline cache", Require(name, "enabled blend pipeline cache",
enabled_blend.pipeline != disabled_blend.pipeline && enabled_blend.pipeline != disabled_blend.pipeline &&
blend_pipeline(true, false).pipeline == enabled_blend.pipeline, blend_pipeline(true, false).pipeline == enabled_blend.pipeline,
"active blending was lost from the pipeline key or missed its cached pipeline"); "active blending was lost from the pipeline key or missed its cached pipeline");
auto dormant_alpha = registers.GetBlendControl(0);
dormant_alpha.alpha_srcblend = static_cast<uint8_t>(Prospero::BlendFactor::kOne);
registers.SetBlendControl(0, dormant_alpha);
Require(name, "dormant alpha blend pipeline cache",
pipeline(true, 2, 2).pipeline == enabled_blend.pipeline,
"inactive separate-alpha state recompiled the pipeline");
draw(enabled_blend); draw(enabled_blend);
const auto blended_pixels = read_color(); const auto blended_pixels = read_color();
Require(name, "active blend output", Require(name, "active blend output",