octo/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8038 from liamwhite/exit-register-detection

Browse Source 
shader_recompiler/EXIT: increment output register on failed enable test
This commit is contained in:
Ameer J
2022-03-21 21:24:07 -04:00
committed by GitHub
parent 82ac66f8a4 536d7ed7b1
commit 75046a3351
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shader_recompiler/frontend/maxwell/translate/impl/exit_program.cpp
View File

@@ -11,9 +11,13 @@ void ExitFragment(TranslatorVisitor& v) {
const ProgramHeader sph{v.env.SPH()}; const ProgramHeader sph{v.env.SPH()};
IR::Reg src_reg{IR::Reg::R0}; IR::Reg src_reg{IR::Reg::R0};
for (u32 render_target = 0; render_target < 8; ++render_target) { for (u32 render_target = 0; render_target < 8; ++render_target) {
if (!sph.ps.HasOutputComponents(render_target)) {
continue;
}
const std::array<bool, 4> mask{sph.ps.EnabledOutputComponents(render_target)}; const std::array<bool, 4> mask{sph.ps.EnabledOutputComponents(render_target)};
for (u32 component = 0; component < 4; ++component) { for (u32 component = 0; component < 4; ++component) {
if (!mask[component]) { if (!mask[component]) {
++src_reg;
continue; continue;
} }
v.ir.SetFragColor(render_target, component, v.F(src_reg)); v.ir.SetFragColor(render_target, component, v.F(src_reg));

5
src/shader_recompiler/program_header.h
View File

@@ -196,6 +196,11 @@ struct ProgramHeader {
return {(bits & 1) != 0, (bits & 2) != 0, (bits & 4) != 0, (bits & 8) != 0}; return {(bits & 1) != 0, (bits & 2) != 0, (bits & 4) != 0, (bits & 8) != 0};
} }
[[nodiscard]] bool HasOutputComponents(u32 rt) const noexcept {
const u32 bits{omap.target >> (rt * 4)};
return (bits & 0xf) != 0;
}
[[nodiscard]] std::array<PixelImap, 4> GenericInputMap(u32 attribute) const { [[nodiscard]] std::array<PixelImap, 4> GenericInputMap(u32 attribute) const {
const auto& vector{imap_generic_vector[attribute]}; const auto& vector{imap_generic_vector[attribute]};
return {vector.x, vector.y, vector.z, vector.w}; return {vector.x, vector.y, vector.z, vector.w};