summaryrefslogtreecommitdiff
path: root/src/core/hw
diff options
context:
space:
mode:
authorGravatar James Rowe2018-01-11 20:33:56 -0700
committerGravatar James Rowe2018-01-12 19:11:04 -0700
commit389979018cce654b1ade0161abfc627832afe592 (patch)
tree90536049d982e4f5ee1df984b1d9da52db704e95 /src/core/hw
parentRemove references to PICA and rasterizers in video_core (diff)
downloadyuzu-389979018cce654b1ade0161abfc627832afe592.tar.gz
yuzu-389979018cce654b1ade0161abfc627832afe592.tar.xz
yuzu-389979018cce654b1ade0161abfc627832afe592.zip
Remove gpu debugger and get yuzu qt to compile
Diffstat (limited to 'src/core/hw')
-rw-r--r--src/core/hw/hw.cpp7
-rw-r--r--src/core/hw/lcd.cpp9
2 files changed, 0 insertions, 16 deletions
diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp
index 8499f2ce6..a751b1d62 100644
--- a/src/core/hw/hw.cpp
+++ b/src/core/hw/hw.cpp
@@ -4,8 +4,6 @@
4 4
5#include "common/common_types.h" 5#include "common/common_types.h"
6#include "common/logging/log.h" 6#include "common/logging/log.h"
7#include "core/hw/aes/key.h"
8#include "core/hw/gpu.h"
9#include "core/hw/hw.h" 7#include "core/hw/hw.h"
10#include "core/hw/lcd.h" 8#include "core/hw/lcd.h"
11 9
@@ -30,7 +28,6 @@ inline void Read(T& var, const u32 addr) {
30 case VADDR_GPU + 0xD000: 28 case VADDR_GPU + 0xD000:
31 case VADDR_GPU + 0xE000: 29 case VADDR_GPU + 0xE000:
32 case VADDR_GPU + 0xF000: 30 case VADDR_GPU + 0xF000:
33 GPU::Read(var, addr);
34 break; 31 break;
35 case VADDR_LCD: 32 case VADDR_LCD:
36 LCD::Read(var, addr); 33 LCD::Read(var, addr);
@@ -59,7 +56,6 @@ inline void Write(u32 addr, const T data) {
59 case VADDR_GPU + 0xD000: 56 case VADDR_GPU + 0xD000:
60 case VADDR_GPU + 0xE000: 57 case VADDR_GPU + 0xE000:
61 case VADDR_GPU + 0xF000: 58 case VADDR_GPU + 0xF000:
62 GPU::Write(addr, data);
63 break; 59 break;
64 case VADDR_LCD: 60 case VADDR_LCD:
65 LCD::Write(addr, data); 61 LCD::Write(addr, data);
@@ -86,15 +82,12 @@ void Update() {}
86 82
87/// Initialize hardware 83/// Initialize hardware
88void Init() { 84void Init() {
89 AES::InitKeys();
90 GPU::Init();
91 LCD::Init(); 85 LCD::Init();
92 LOG_DEBUG(HW, "initialized OK"); 86 LOG_DEBUG(HW, "initialized OK");
93} 87}
94 88
95/// Shutdown hardware 89/// Shutdown hardware
96void Shutdown() { 90void Shutdown() {
97 GPU::Shutdown();
98 LCD::Shutdown(); 91 LCD::Shutdown();
99 LOG_DEBUG(HW, "shutdown OK"); 92 LOG_DEBUG(HW, "shutdown OK");
100} 93}
diff --git a/src/core/hw/lcd.cpp b/src/core/hw/lcd.cpp
index 2aa89de18..763ac1c4d 100644
--- a/src/core/hw/lcd.cpp
+++ b/src/core/hw/lcd.cpp
@@ -8,7 +8,6 @@
8#include "core/hw/hw.h" 8#include "core/hw/hw.h"
9#include "core/hw/lcd.h" 9#include "core/hw/lcd.h"
10#include "core/tracer/recorder.h" 10#include "core/tracer/recorder.h"
11#include "video_core/debug_utils/debug_utils.h"
12 11
13namespace LCD { 12namespace LCD {
14 13
@@ -40,14 +39,6 @@ inline void Write(u32 addr, const T data) {
40 } 39 }
41 40
42 g_regs[index] = static_cast<u32>(data); 41 g_regs[index] = static_cast<u32>(data);
43
44 // Notify tracer about the register write
45 // This is happening *after* handling the write to make sure we properly catch all memory reads.
46 if (Pica::g_debug_context && Pica::g_debug_context->recorder) {
47 // addr + GPU VBase - IO VBase + IO PBase
48 Pica::g_debug_context->recorder->RegisterWritten<T>(
49 addr + HW::VADDR_LCD - 0x1EC00000 + 0x10100000, data);
50 }
51} 42}
52 43
53// Explicitly instantiate template functions because we aren't defining this in the header: 44// Explicitly instantiate template functions because we aren't defining this in the header: