diff options
Diffstat (limited to 'src/citra_qt/debugger')
| -rw-r--r-- | src/citra_qt/debugger/callstack.cpp | 4 | ||||
| -rw-r--r-- | src/citra_qt/debugger/callstack.hxx | 4 | ||||
| -rw-r--r-- | src/citra_qt/debugger/disassembler.cpp | 4 | ||||
| -rw-r--r-- | src/citra_qt/debugger/disassembler.hxx | 4 | ||||
| -rw-r--r-- | src/citra_qt/debugger/graphics_cmdlists.cpp | 4 | ||||
| -rw-r--r-- | src/citra_qt/debugger/graphics_framebuffer.cpp | 16 | ||||
| -rw-r--r-- | src/citra_qt/debugger/graphics_framebuffer.hxx | 4 | ||||
| -rw-r--r-- | src/citra_qt/debugger/ramview.cpp | 4 | ||||
| -rw-r--r-- | src/citra_qt/debugger/ramview.hxx | 4 | ||||
| -rw-r--r-- | src/citra_qt/debugger/registers.cpp | 4 | ||||
| -rw-r--r-- | src/citra_qt/debugger/registers.hxx | 4 |
11 files changed, 44 insertions, 12 deletions
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index 16c6113be..4a47ad468 100644 --- a/src/citra_qt/debugger/callstack.cpp +++ b/src/citra_qt/debugger/callstack.cpp | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 1 | #include <QStandardItemModel> | 5 | #include <QStandardItemModel> |
| 2 | 6 | ||
| 3 | #include "callstack.hxx" | 7 | #include "callstack.hxx" |
diff --git a/src/citra_qt/debugger/callstack.hxx b/src/citra_qt/debugger/callstack.hxx index 680a73b6d..4f4f74823 100644 --- a/src/citra_qt/debugger/callstack.hxx +++ b/src/citra_qt/debugger/callstack.hxx | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 1 | #include <QDockWidget> | 5 | #include <QDockWidget> |
| 2 | #include "ui_callstack.h" | 6 | #include "ui_callstack.h" |
| 3 | 7 | ||
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index 14745f3bb..636a0f187 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 1 | #include "disassembler.hxx" | 5 | #include "disassembler.hxx" |
| 2 | 6 | ||
| 3 | #include "../bootmanager.hxx" | 7 | #include "../bootmanager.hxx" |
diff --git a/src/citra_qt/debugger/disassembler.hxx b/src/citra_qt/debugger/disassembler.hxx index a842da956..6d3cef108 100644 --- a/src/citra_qt/debugger/disassembler.hxx +++ b/src/citra_qt/debugger/disassembler.hxx | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 1 | #include <QAbstractItemModel> | 5 | #include <QAbstractItemModel> |
| 2 | #include <QDockWidget> | 6 | #include <QDockWidget> |
| 3 | #include "ui_disassembler.h" | 7 | #include "ui_disassembler.h" |
diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp index 753cc25da..708b805a7 100644 --- a/src/citra_qt/debugger/graphics_cmdlists.cpp +++ b/src/citra_qt/debugger/graphics_cmdlists.cpp | |||
| @@ -229,7 +229,7 @@ void GPUCommandListModel::OnPicaTraceFinished(const Pica::DebugUtils::PicaTrace& | |||
| 229 | cmd_id < PICA_REG_INDEX(reg_name) + sizeof(decltype(Pica::registers.reg_name)) / 4) | 229 | cmd_id < PICA_REG_INDEX(reg_name) + sizeof(decltype(Pica::registers.reg_name)) / 4) |
| 230 | 230 | ||
| 231 | void GPUCommandListWidget::OnCommandDoubleClicked(const QModelIndex& index) { | 231 | void GPUCommandListWidget::OnCommandDoubleClicked(const QModelIndex& index) { |
| 232 | const int command_id = list_widget->model()->data(index, GPUCommandListModel::CommandIdRole).toInt(); | 232 | const unsigned int command_id = list_widget->model()->data(index, GPUCommandListModel::CommandIdRole).toUInt(); |
| 233 | if (COMMAND_IN_RANGE(command_id, texture0) || | 233 | if (COMMAND_IN_RANGE(command_id, texture0) || |
| 234 | COMMAND_IN_RANGE(command_id, texture1) || | 234 | COMMAND_IN_RANGE(command_id, texture1) || |
| 235 | COMMAND_IN_RANGE(command_id, texture2)) { | 235 | COMMAND_IN_RANGE(command_id, texture2)) { |
| @@ -255,7 +255,7 @@ void GPUCommandListWidget::OnCommandDoubleClicked(const QModelIndex& index) { | |||
| 255 | void GPUCommandListWidget::SetCommandInfo(const QModelIndex& index) { | 255 | void GPUCommandListWidget::SetCommandInfo(const QModelIndex& index) { |
| 256 | QWidget* new_info_widget; | 256 | QWidget* new_info_widget; |
| 257 | 257 | ||
| 258 | const int command_id = list_widget->model()->data(index, GPUCommandListModel::CommandIdRole).toInt(); | 258 | const unsigned int command_id = list_widget->model()->data(index, GPUCommandListModel::CommandIdRole).toUInt(); |
| 259 | if (COMMAND_IN_RANGE(command_id, texture0) || | 259 | if (COMMAND_IN_RANGE(command_id, texture0) || |
| 260 | COMMAND_IN_RANGE(command_id, texture1) || | 260 | COMMAND_IN_RANGE(command_id, texture1) || |
| 261 | COMMAND_IN_RANGE(command_id, texture2)) { | 261 | COMMAND_IN_RANGE(command_id, texture2)) { |
diff --git a/src/citra_qt/debugger/graphics_framebuffer.cpp b/src/citra_qt/debugger/graphics_framebuffer.cpp index a9e9de652..7ef699f37 100644 --- a/src/citra_qt/debugger/graphics_framebuffer.cpp +++ b/src/citra_qt/debugger/graphics_framebuffer.cpp | |||
| @@ -158,7 +158,7 @@ void GraphicsFramebufferWidget::OnFramebufferAddressChanged(qint64 new_value) | |||
| 158 | } | 158 | } |
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | void GraphicsFramebufferWidget::OnFramebufferWidthChanged(int new_value) | 161 | void GraphicsFramebufferWidget::OnFramebufferWidthChanged(unsigned int new_value) |
| 162 | { | 162 | { |
| 163 | if (framebuffer_width != new_value) { | 163 | if (framebuffer_width != new_value) { |
| 164 | framebuffer_width = new_value; | 164 | framebuffer_width = new_value; |
| @@ -168,7 +168,7 @@ void GraphicsFramebufferWidget::OnFramebufferWidthChanged(int new_value) | |||
| 168 | } | 168 | } |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | void GraphicsFramebufferWidget::OnFramebufferHeightChanged(int new_value) | 171 | void GraphicsFramebufferWidget::OnFramebufferHeightChanged(unsigned int new_value) |
| 172 | { | 172 | { |
| 173 | if (framebuffer_height != new_value) { | 173 | if (framebuffer_height != new_value) { |
| 174 | framebuffer_height = new_value; | 174 | framebuffer_height = new_value; |
| @@ -227,8 +227,8 @@ void GraphicsFramebufferWidget::OnUpdate() | |||
| 227 | { | 227 | { |
| 228 | QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32); | 228 | QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32); |
| 229 | u32* color_buffer = (u32*)Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address)); | 229 | u32* color_buffer = (u32*)Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address)); |
| 230 | for (unsigned y = 0; y < framebuffer_height; ++y) { | 230 | for (unsigned int y = 0; y < framebuffer_height; ++y) { |
| 231 | for (unsigned x = 0; x < framebuffer_width; ++x) { | 231 | for (unsigned int x = 0; x < framebuffer_width; ++x) { |
| 232 | u32 value = *(color_buffer + x + y * framebuffer_width); | 232 | u32 value = *(color_buffer + x + y * framebuffer_width); |
| 233 | 233 | ||
| 234 | decoded_image.setPixel(x, y, qRgba((value >> 16) & 0xFF, (value >> 8) & 0xFF, value & 0xFF, 255/*value >> 24*/)); | 234 | decoded_image.setPixel(x, y, qRgba((value >> 16) & 0xFF, (value >> 8) & 0xFF, value & 0xFF, 255/*value >> 24*/)); |
| @@ -242,8 +242,8 @@ void GraphicsFramebufferWidget::OnUpdate() | |||
| 242 | { | 242 | { |
| 243 | QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32); | 243 | QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32); |
| 244 | u8* color_buffer = Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address)); | 244 | u8* color_buffer = Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address)); |
| 245 | for (unsigned y = 0; y < framebuffer_height; ++y) { | 245 | for (unsigned int y = 0; y < framebuffer_height; ++y) { |
| 246 | for (unsigned x = 0; x < framebuffer_width; ++x) { | 246 | for (unsigned int x = 0; x < framebuffer_width; ++x) { |
| 247 | u8* pixel_pointer = color_buffer + x * 3 + y * 3 * framebuffer_width; | 247 | u8* pixel_pointer = color_buffer + x * 3 + y * 3 * framebuffer_width; |
| 248 | 248 | ||
| 249 | decoded_image.setPixel(x, y, qRgba(pixel_pointer[0], pixel_pointer[1], pixel_pointer[2], 255/*value >> 24*/)); | 249 | decoded_image.setPixel(x, y, qRgba(pixel_pointer[0], pixel_pointer[1], pixel_pointer[2], 255/*value >> 24*/)); |
| @@ -257,8 +257,8 @@ void GraphicsFramebufferWidget::OnUpdate() | |||
| 257 | { | 257 | { |
| 258 | QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32); | 258 | QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32); |
| 259 | u32* color_buffer = (u32*)Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address)); | 259 | u32* color_buffer = (u32*)Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address)); |
| 260 | for (unsigned y = 0; y < framebuffer_height; ++y) { | 260 | for (unsigned int y = 0; y < framebuffer_height; ++y) { |
| 261 | for (unsigned x = 0; x < framebuffer_width; ++x) { | 261 | for (unsigned int x = 0; x < framebuffer_width; ++x) { |
| 262 | u16 value = *(u16*)(((u8*)color_buffer) + x * 2 + y * framebuffer_width * 2); | 262 | u16 value = *(u16*)(((u8*)color_buffer) + x * 2 + y * framebuffer_width * 2); |
| 263 | u8 r = Color::Convert5To8((value >> 11) & 0x1F); | 263 | u8 r = Color::Convert5To8((value >> 11) & 0x1F); |
| 264 | u8 g = Color::Convert5To8((value >> 6) & 0x1F); | 264 | u8 g = Color::Convert5To8((value >> 6) & 0x1F); |
diff --git a/src/citra_qt/debugger/graphics_framebuffer.hxx b/src/citra_qt/debugger/graphics_framebuffer.hxx index 56215761e..02813525c 100644 --- a/src/citra_qt/debugger/graphics_framebuffer.hxx +++ b/src/citra_qt/debugger/graphics_framebuffer.hxx | |||
| @@ -62,8 +62,8 @@ public: | |||
| 62 | public slots: | 62 | public slots: |
| 63 | void OnFramebufferSourceChanged(int new_value); | 63 | void OnFramebufferSourceChanged(int new_value); |
| 64 | void OnFramebufferAddressChanged(qint64 new_value); | 64 | void OnFramebufferAddressChanged(qint64 new_value); |
| 65 | void OnFramebufferWidthChanged(int new_value); | 65 | void OnFramebufferWidthChanged(unsigned int new_value); |
| 66 | void OnFramebufferHeightChanged(int new_value); | 66 | void OnFramebufferHeightChanged(unsigned int new_value); |
| 67 | void OnFramebufferFormatChanged(int new_value); | 67 | void OnFramebufferFormatChanged(int new_value); |
| 68 | void OnUpdate(); | 68 | void OnUpdate(); |
| 69 | 69 | ||
diff --git a/src/citra_qt/debugger/ramview.cpp b/src/citra_qt/debugger/ramview.cpp index 3f899b95e..d3ff69a61 100644 --- a/src/citra_qt/debugger/ramview.cpp +++ b/src/citra_qt/debugger/ramview.cpp | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 1 | #include "ramview.hxx" | 5 | #include "ramview.hxx" |
| 2 | 6 | ||
| 3 | #include "common/common.h" | 7 | #include "common/common.h" |
diff --git a/src/citra_qt/debugger/ramview.hxx b/src/citra_qt/debugger/ramview.hxx index 1db1546aa..18423036f 100644 --- a/src/citra_qt/debugger/ramview.hxx +++ b/src/citra_qt/debugger/ramview.hxx | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 1 | #include "qhexedit.h" | 5 | #include "qhexedit.h" |
| 2 | 6 | ||
| 3 | class GRamView : public QHexEdit | 7 | class GRamView : public QHexEdit |
diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp index ed17ee4b4..f798495b2 100644 --- a/src/citra_qt/debugger/registers.cpp +++ b/src/citra_qt/debugger/registers.cpp | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 1 | #include "registers.hxx" | 5 | #include "registers.hxx" |
| 2 | 6 | ||
| 3 | #include "core/core.h" | 7 | #include "core/core.h" |
diff --git a/src/citra_qt/debugger/registers.hxx b/src/citra_qt/debugger/registers.hxx index 4cca957ce..ac8429f2b 100644 --- a/src/citra_qt/debugger/registers.hxx +++ b/src/citra_qt/debugger/registers.hxx | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 1 | #include "ui_registers.h" | 5 | #include "ui_registers.h" |
| 2 | 6 | ||
| 3 | #include <QDockWidget> | 7 | #include <QDockWidget> |