mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-11-15 23:50:05 +00:00
Merge pull request #3469 from namkazt/patch-1
shader_decode: Fix LD, LDG when track constant buffer
This commit is contained in:
commit
fa1d625eed
@ -157,13 +157,21 @@ std::tuple<Node, u32, u32> ShaderIR::TrackCbuf(Node tracked, const NodeBlock& co
|
|||||||
if (gpr->GetIndex() == Tegra::Shader::Register::ZeroIndex) {
|
if (gpr->GetIndex() == Tegra::Shader::Register::ZeroIndex) {
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
// Reduce the cursor in one to avoid infinite loops when the instruction sets the same
|
s64 current_cursor = cursor;
|
||||||
// register that it uses as operand
|
while (current_cursor > 0) {
|
||||||
const auto [source, new_cursor] = TrackRegister(gpr, code, cursor - 1);
|
// Reduce the cursor in one to avoid infinite loops when the instruction sets the same
|
||||||
if (!source) {
|
// register that it uses as operand
|
||||||
return {};
|
const auto [source, new_cursor] = TrackRegister(gpr, code, current_cursor - 1);
|
||||||
|
current_cursor = new_cursor;
|
||||||
|
if (!source) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const auto [base_address, index, offset] = TrackCbuf(source, code, current_cursor);
|
||||||
|
if (base_address != nullptr) {
|
||||||
|
return {base_address, index, offset};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return TrackCbuf(source, code, new_cursor);
|
return {};
|
||||||
}
|
}
|
||||||
if (const auto operation = std::get_if<OperationNode>(&*tracked)) {
|
if (const auto operation = std::get_if<OperationNode>(&*tracked)) {
|
||||||
for (std::size_t i = operation->GetOperandsCount(); i > 0; --i) {
|
for (std::size_t i = operation->GetOperandsCount(); i > 0; --i) {
|
||||||
|
Loading…
Reference in New Issue
Block a user