diff options
Diffstat (limited to '')
| -rw-r--r-- | src/citra_qt/debugger/callstack.cpp | 8 | ||||
| -rw-r--r-- | src/citra_qt/debugger/graphics_tracing.cpp | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index 6799ce844..e97e81b65 100644 --- a/src/citra_qt/debugger/callstack.cpp +++ b/src/citra_qt/debugger/callstack.cpp @@ -4,12 +4,14 @@ #include <QStandardItemModel> +#include "common/common_types.h" +#include "common/symbols.h" + #include "callstack.h" #include "core/core.h" #include "core/arm/arm_interface.h" #include "core/memory.h" -#include "common/symbols.h" #include "core/arm/disassembler/arm_disasm.h" CallstackWidget::CallstackWidget(QWidget* parent): QDockWidget(parent) @@ -49,8 +51,8 @@ void CallstackWidget::OnDebugModeEntered() { std::string name; // ripped from disasm - uint8_t cond = (insn >> 28) & 0xf; - uint32_t i_offset = insn & 0xffffff; + u8 cond = (insn >> 28) & 0xf; + u32 i_offset = insn & 0xffffff; // Sign-extend the 24-bit offset if ((i_offset >> 23) & 1) i_offset |= 0xff000000; diff --git a/src/citra_qt/debugger/graphics_tracing.cpp b/src/citra_qt/debugger/graphics_tracing.cpp index 3f20f149d..f80cb7493 100644 --- a/src/citra_qt/debugger/graphics_tracing.cpp +++ b/src/citra_qt/debugger/graphics_tracing.cpp @@ -14,6 +14,8 @@ #include <boost/range/algorithm/copy.hpp> +#include "common/common_types.h" + #include "core/hw/gpu.h" #include "core/hw/lcd.h" @@ -66,14 +68,14 @@ void GraphicsTracingWidget::StartRecording() { // Encode floating point numbers to 24-bit values // TODO: Drop this explicit conversion once we store float24 values bit-correctly internally. - std::array<uint32_t, 4 * 16> default_attributes; + std::array<u32, 4 * 16> default_attributes; for (unsigned i = 0; i < 16; ++i) { for (unsigned comp = 0; comp < 3; ++comp) { default_attributes[4 * i + comp] = nihstro::to_float24(Pica::g_state.vs.default_attributes[i][comp].ToFloat32()); } } - std::array<uint32_t, 4 * 96> vs_float_uniforms; + std::array<u32, 4 * 96> vs_float_uniforms; for (unsigned i = 0; i < 96; ++i) for (unsigned comp = 0; comp < 3; ++comp) vs_float_uniforms[4 * i + comp] = nihstro::to_float24(Pica::g_state.vs.uniforms.f[i][comp].ToFloat32()); |