yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

graphics_cmdlists: Get rid of variable shadowing

This commit is contained in:
Lioncash 2016-12-10 19:44:01 -05:00
parent 1e5644935d
commit 4e7092881f
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/citra_qt/debugger/graphics_cmdlists.cpp
View File

@ -124,19 +124,21 @@ void GPUCommandListWidget::OnCommandDoubleClicked(const QModelIndex& index) {
if (COMMAND_IN_RANGE(command_id, texture0) || COMMAND_IN_RANGE(command_id, texture1) || if (COMMAND_IN_RANGE(command_id, texture0) || COMMAND_IN_RANGE(command_id, texture1) ||
COMMAND_IN_RANGE(command_id, texture2)) { COMMAND_IN_RANGE(command_id, texture2)) {
unsigned index; unsigned texture_index;
if (COMMAND_IN_RANGE(command_id, texture0)) { if (COMMAND_IN_RANGE(command_id, texture0)) {
index = 0; texture_index = 0;
} else if (COMMAND_IN_RANGE(command_id, texture1)) { } else if (COMMAND_IN_RANGE(command_id, texture1)) {
index = 1; texture_index = 1;
} else if (COMMAND_IN_RANGE(command_id, texture2)) { } else if (COMMAND_IN_RANGE(command_id, texture2)) {
index = 2; texture_index = 2;
} else { } else {
UNREACHABLE_MSG("Unknown texture command"); UNREACHABLE_MSG("Unknown texture command");
} }
auto config = Pica::g_state.regs.GetTextures()[index].config;
auto format = Pica::g_state.regs.GetTextures()[index].format; const auto texture = Pica::g_state.regs.GetTextures()[texture_index];
auto info = Pica::DebugUtils::TextureInfo::FromPicaRegister(config, format); const auto config = texture.config;
const auto format = texture.format;
const auto info = Pica::DebugUtils::TextureInfo::FromPicaRegister(config, format);
// TODO: Open a surface debugger // TODO: Open a surface debugger
} }
@ -150,18 +152,20 @@ void GPUCommandListWidget::SetCommandInfo(const QModelIndex& index) {
if (COMMAND_IN_RANGE(command_id, texture0) || COMMAND_IN_RANGE(command_id, texture1) || if (COMMAND_IN_RANGE(command_id, texture0) || COMMAND_IN_RANGE(command_id, texture1) ||
COMMAND_IN_RANGE(command_id, texture2)) { COMMAND_IN_RANGE(command_id, texture2)) {
unsigned index; unsigned texture_index;
if (COMMAND_IN_RANGE(command_id, texture0)) { if (COMMAND_IN_RANGE(command_id, texture0)) {
index = 0; texture_index = 0;
} else if (COMMAND_IN_RANGE(command_id, texture1)) { } else if (COMMAND_IN_RANGE(command_id, texture1)) {
index = 1; texture_index = 1;
} else { } else {
index = 2; texture_index = 2;
} }
auto config = Pica::g_state.regs.GetTextures()[index].config;
auto format = Pica::g_state.regs.GetTextures()[index].format;
auto info = Pica::DebugUtils::TextureInfo::FromPicaRegister(config, format); const auto texture = Pica::g_state.regs.GetTextures()[texture_index];
const auto config = texture.config;
const auto format = texture.format;
const auto info = Pica::DebugUtils::TextureInfo::FromPicaRegister(config, format);
const u8* src = Memory::GetPhysicalPointer(config.GetPhysicalAddress()); const u8* src = Memory::GetPhysicalPointer(config.GetPhysicalAddress());
new_info_widget = new TextureInfoWidget(src, info); new_info_widget = new TextureInfoWidget(src, info);
} }