summaryrefslogtreecommitdiffstats
path: root/src/citra_qt/debugger
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-05-14 05:29:27 +0200
committerbunnei <bunneidev@gmail.com>2015-05-23 04:59:42 +0200
commit1b42d55a9dcb27ac2374de0ed0d1d0ec8385b13e (patch)
treec21e1e3b667abbe498e1ab818c25988095cd0dbf /src/citra_qt/debugger
parentMerge pull request #803 from lioncash/typo (diff)
downloadyuzu-1b42d55a9dcb27ac2374de0ed0d1d0ec8385b13e.tar
yuzu-1b42d55a9dcb27ac2374de0ed0d1d0ec8385b13e.tar.gz
yuzu-1b42d55a9dcb27ac2374de0ed0d1d0ec8385b13e.tar.bz2
yuzu-1b42d55a9dcb27ac2374de0ed0d1d0ec8385b13e.tar.lz
yuzu-1b42d55a9dcb27ac2374de0ed0d1d0ec8385b13e.tar.xz
yuzu-1b42d55a9dcb27ac2374de0ed0d1d0ec8385b13e.tar.zst
yuzu-1b42d55a9dcb27ac2374de0ed0d1d0ec8385b13e.zip
Diffstat (limited to 'src/citra_qt/debugger')
-rw-r--r--src/citra_qt/debugger/graphics_cmdlists.cpp10
-rw-r--r--src/citra_qt/debugger/graphics_framebuffer.cpp4
-rw-r--r--src/citra_qt/debugger/graphics_vertex_shader.cpp6
3 files changed, 10 insertions, 10 deletions
diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp
index 66e11dd5b..804c735a3 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.cpp
+++ b/src/citra_qt/debugger/graphics_cmdlists.cpp
@@ -228,7 +228,7 @@ void GPUCommandListModel::OnPicaTraceFinished(const Pica::DebugUtils::PicaTrace&
#define COMMAND_IN_RANGE(cmd_id, reg_name) \
(cmd_id >= PICA_REG_INDEX(reg_name) && \
- cmd_id < PICA_REG_INDEX(reg_name) + sizeof(decltype(Pica::registers.reg_name)) / 4)
+ cmd_id < PICA_REG_INDEX(reg_name) + sizeof(decltype(Pica::g_state.regs.reg_name)) / 4)
void GPUCommandListWidget::OnCommandDoubleClicked(const QModelIndex& index) {
const unsigned int command_id = list_widget->model()->data(index, GPUCommandListModel::CommandIdRole).toUInt();
@@ -244,8 +244,8 @@ void GPUCommandListWidget::OnCommandDoubleClicked(const QModelIndex& index) {
} else {
index = 2;
}
- auto config = Pica::registers.GetTextures()[index].config;
- auto format = Pica::registers.GetTextures()[index].format;
+ 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);
// TODO: Instead, emit a signal here to be caught by the main window widget.
@@ -270,8 +270,8 @@ void GPUCommandListWidget::SetCommandInfo(const QModelIndex& index) {
} else {
index = 2;
}
- auto config = Pica::registers.GetTextures()[index].config;
- auto format = Pica::registers.GetTextures()[index].format;
+ 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);
u8* src = Memory::GetPhysicalPointer(config.GetPhysicalAddress());
diff --git a/src/citra_qt/debugger/graphics_framebuffer.cpp b/src/citra_qt/debugger/graphics_framebuffer.cpp
index 0c1a3f47f..e07344591 100644
--- a/src/citra_qt/debugger/graphics_framebuffer.cpp
+++ b/src/citra_qt/debugger/graphics_framebuffer.cpp
@@ -178,7 +178,7 @@ void GraphicsFramebufferWidget::OnUpdate()
{
// TODO: Store a reference to the registers in the debug context instead of accessing them directly...
- const auto& framebuffer = Pica::registers.framebuffer;
+ const auto& framebuffer = Pica::g_state.regs.framebuffer;
framebuffer_address = framebuffer.GetColorBufferPhysicalAddress();
framebuffer_width = framebuffer.GetWidth();
@@ -191,7 +191,7 @@ void GraphicsFramebufferWidget::OnUpdate()
case Source::DepthBuffer:
{
- const auto& framebuffer = Pica::registers.framebuffer;
+ const auto& framebuffer = Pica::g_state.regs.framebuffer;
framebuffer_address = framebuffer.GetDepthBufferPhysicalAddress();
framebuffer_width = framebuffer.GetWidth();
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp
index 3b072d015..14d3f8f39 100644
--- a/src/citra_qt/debugger/graphics_vertex_shader.cpp
+++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp
@@ -253,13 +253,13 @@ void GraphicsVertexShaderModel::OnUpdate()
info.Clear();
- for (auto instr : Pica::VertexShader::GetShaderBinary())
+ for (auto instr : Pica::g_state.vs.program_code)
info.code.push_back({instr});
- for (auto pattern : Pica::VertexShader::GetSwizzlePatterns())
+ for (auto pattern : Pica::g_state.vs.swizzle_data)
info.swizzle_info.push_back({pattern});
- info.labels.insert({Pica::registers.vs_main_offset, "main"});
+ info.labels.insert({ Pica::g_state.regs.vs_main_offset, "main" });
endResetModel();
}