fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Vulkan] Fix FSI 2x-as-4x sample mask reading host sample 2 instead of 3

Browse Source 
Guest sample 1 lives in host sample 3 when 2x-as-4x. This might have originally just been a typo or oversight.

Co-authored-by: Herman S. <429230+has207@users.noreply.github.com>
This commit is contained in:
goldislead
2026-08-06 13:05:00 -07:00
committed by Radosław Gliński
parent 0d38781760
commit 654a8cacf5
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/xenia/gpu/spirv_shader_translator_rb.cc
View File

@@ -645,6 +645,22 @@ void SpirvShaderTranslator::CompleteFragmentShaderInMain() {
block_rt_0_alpha_tests_rt_written_head->getId());
main_fsi_sample_mask_ =
builder_->createOp(spv::OpPhi, type_uint_, id_vector_temp_);
} else if (edram_fragment_shader_interlock_) {
// Demote path: the alpha test demotes instead of touching the mask, but
// alpha to coverage still modified main_fsi_sample_mask_ inside the
// written branch. Merge in fsi_sample_mask_in_rt_0_alpha_tests, the
// mask from before the branch, on the edge where the render target
// wasn't written so the value dominates the merge. Otherwise it is
// undefined there (invalid SPIR-V dominance and garbage coverage).
id_vector_temp_.clear();
id_vector_temp_.push_back(main_fsi_sample_mask_);
id_vector_temp_.push_back(
block_rt_0_alpha_tests_rt_written_end.getId());
id_vector_temp_.push_back(fsi_sample_mask_in_rt_0_alpha_tests);
id_vector_temp_.push_back(
block_rt_0_alpha_tests_rt_written_head->getId());
main_fsi_sample_mask_ =
builder_->createOp(spv::OpPhi, type_uint_, id_vector_temp_);
}
}
}
@@ -1741,12 +1757,12 @@ void SpirvShaderTranslator::FSI_LoadSampleMask(spv::Id msaa_samples) {
input_sample_mask_value),
builder_->makeUintConstant(32 - 2));
} else {
// 0 and 3 to 0 and 1.
// 0 and 3 to 0 and 1. Guest sample 1 comes from host sample 3.
sample_mask_2x = builder_->createQuadOp(
spv::OpBitFieldInsert, type_uint_, input_sample_mask_value,
builder_->createTriOp(spv::OpBitFieldUExtract, type_uint_,
input_sample_mask_value, const_uint_2,
const_uint_1),
input_sample_mask_value,
builder_->makeUintConstant(3), const_uint_1),
const_uint_1, builder_->makeUintConstant(32 - 1));
}
builder_->createBranch(&block_msaa_merge);