diff options
| author | 2015-07-24 01:58:11 +0200 | |
|---|---|---|
| committer | 2015-07-24 01:58:11 +0200 | |
| commit | 1760eb5ca692b4ca289087eaae1e0975a545be3e (patch) | |
| tree | d10fbb61342af95db208b300e1185f9503f1a79c /src/core | |
| parent | Merge pull request #977 from yuriks/glenable-tex2d (diff) | |
| parent | Qt/GPU Breakpoints: Added three more breakpoint types: (diff) | |
| download | yuzu-1760eb5ca692b4ca289087eaae1e0975a545be3e.tar.gz yuzu-1760eb5ca692b4ca289087eaae1e0975a545be3e.tar.xz yuzu-1760eb5ca692b4ca289087eaae1e0975a545be3e.zip | |
Merge pull request #980 from Subv/more_breakpoints
Qt/GPU Breakpoints: Added three more breakpoint types.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/gsp_gpu.cpp | 7 | ||||
| -rw-r--r-- | src/core/hw/gpu.cpp | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/core/hle/service/gsp_gpu.cpp b/src/core/hle/service/gsp_gpu.cpp index 8b40ba376..832273f39 100644 --- a/src/core/hle/service/gsp_gpu.cpp +++ b/src/core/hle/service/gsp_gpu.cpp | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include "core/hw/lcd.h" | 14 | #include "core/hw/lcd.h" |
| 15 | 15 | ||
| 16 | #include "video_core/gpu_debugger.h" | 16 | #include "video_core/gpu_debugger.h" |
| 17 | #include "video_core/debug_utils/debug_utils.h" | ||
| 17 | #include "video_core/renderer_base.h" | 18 | #include "video_core/renderer_base.h" |
| 18 | #include "video_core/video_core.h" | 19 | #include "video_core/video_core.h" |
| 19 | 20 | ||
| @@ -226,6 +227,9 @@ void SetBufferSwap(u32 screen_id, const FrameBufferInfo& info) { | |||
| 226 | &info.format); | 227 | &info.format); |
| 227 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].active_fb)), 4, | 228 | WriteHWRegs(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].active_fb)), 4, |
| 228 | &info.shown_fb); | 229 | &info.shown_fb); |
| 230 | |||
| 231 | if (Pica::g_debug_context) | ||
| 232 | Pica::g_debug_context->OnEvent(Pica::DebugContext::Event::BufferSwapped, nullptr); | ||
| 229 | } | 233 | } |
| 230 | 234 | ||
| 231 | /** | 235 | /** |
| @@ -448,6 +452,9 @@ static void ExecuteCommand(const Command& command, u32 thread_id) { | |||
| 448 | default: | 452 | default: |
| 449 | LOG_ERROR(Service_GSP, "unknown command 0x%08X", (int)command.id.Value()); | 453 | LOG_ERROR(Service_GSP, "unknown command 0x%08X", (int)command.id.Value()); |
| 450 | } | 454 | } |
| 455 | |||
| 456 | if (Pica::g_debug_context) | ||
| 457 | Pica::g_debug_context->OnEvent(Pica::DebugContext::Event::GSPCommandProcessed, (void*)&command); | ||
| 451 | } | 458 | } |
| 452 | 459 | ||
| 453 | /** | 460 | /** |
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index 2a338e8fc..3ccbc03b2 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp | |||
| @@ -151,6 +151,10 @@ inline void Write(u32 addr, const T data) { | |||
| 151 | { | 151 | { |
| 152 | const auto& config = g_regs.display_transfer_config; | 152 | const auto& config = g_regs.display_transfer_config; |
| 153 | if (config.trigger & 1) { | 153 | if (config.trigger & 1) { |
| 154 | |||
| 155 | if (Pica::g_debug_context) | ||
| 156 | Pica::g_debug_context->OnEvent(Pica::DebugContext::Event::IncomingDisplayTransfer, nullptr); | ||
| 157 | |||
| 154 | u8* src_pointer = Memory::GetPhysicalPointer(config.GetPhysicalInputAddress()); | 158 | u8* src_pointer = Memory::GetPhysicalPointer(config.GetPhysicalInputAddress()); |
| 155 | u8* dst_pointer = Memory::GetPhysicalPointer(config.GetPhysicalOutputAddress()); | 159 | u8* dst_pointer = Memory::GetPhysicalPointer(config.GetPhysicalOutputAddress()); |
| 156 | 160 | ||