diff options
| author | 2016-12-10 07:51:50 -0500 | |
|---|---|---|
| committer | 2016-12-11 00:07:27 +0000 | |
| commit | 963aedd8ccc207d5b65b97bd46b930771f2bda6e (patch) | |
| tree | ab238398e6f8a37e4cd105d19dcec54f82ec1bb2 /src/video_core | |
| parent | configure_input: Modernize and cleanup input configuration tab (diff) | |
| download | yuzu-963aedd8ccc207d5b65b97bd46b930771f2bda6e.tar.gz yuzu-963aedd8ccc207d5b65b97bd46b930771f2bda6e.tar.xz yuzu-963aedd8ccc207d5b65b97bd46b930771f2bda6e.zip | |
Add all services to the Service namespace
Previously there was a split where some of the services were in the
Service namespace and others were not.
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/command_processor.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/gpu_debugger.h | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index c80c96762..0495a9fac 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp | |||
| @@ -68,7 +68,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { | |||
| 68 | switch (id) { | 68 | switch (id) { |
| 69 | // Trigger IRQ | 69 | // Trigger IRQ |
| 70 | case PICA_REG_INDEX(trigger_irq): | 70 | case PICA_REG_INDEX(trigger_irq): |
| 71 | GSP_GPU::SignalInterrupt(GSP_GPU::InterruptId::P3D); | 71 | Service::GSP::SignalInterrupt(Service::GSP::InterruptId::P3D); |
| 72 | break; | 72 | break; |
| 73 | 73 | ||
| 74 | case PICA_REG_INDEX_WORKAROUND(triangle_topology, 0x25E): | 74 | case PICA_REG_INDEX_WORKAROUND(triangle_topology, 0x25E): |
diff --git a/src/video_core/gpu_debugger.h b/src/video_core/gpu_debugger.h index 3c6636d66..c1f9b43c2 100644 --- a/src/video_core/gpu_debugger.h +++ b/src/video_core/gpu_debugger.h | |||
| @@ -28,7 +28,8 @@ public: | |||
| 28 | * @note All methods in this class are called from the GSP thread | 28 | * @note All methods in this class are called from the GSP thread |
| 29 | */ | 29 | */ |
| 30 | virtual void GXCommandProcessed(int total_command_count) { | 30 | virtual void GXCommandProcessed(int total_command_count) { |
| 31 | const GSP_GPU::Command& cmd = observed->ReadGXCommandHistory(total_command_count - 1); | 31 | const Service::GSP::Command& cmd = |
| 32 | observed->ReadGXCommandHistory(total_command_count - 1); | ||
| 32 | LOG_TRACE(Debug_GPU, "Received command: id=%x", (int)cmd.id.Value()); | 33 | LOG_TRACE(Debug_GPU, "Received command: id=%x", (int)cmd.id.Value()); |
| 33 | } | 34 | } |
| 34 | 35 | ||
| @@ -48,16 +49,16 @@ public: | |||
| 48 | return; | 49 | return; |
| 49 | 50 | ||
| 50 | gx_command_history.emplace_back(); | 51 | gx_command_history.emplace_back(); |
| 51 | GSP_GPU::Command& cmd = gx_command_history.back(); | 52 | Service::GSP::Command& cmd = gx_command_history.back(); |
| 52 | 53 | ||
| 53 | memcpy(&cmd, command_data, sizeof(GSP_GPU::Command)); | 54 | memcpy(&cmd, command_data, sizeof(Service::GSP::Command)); |
| 54 | 55 | ||
| 55 | ForEachObserver([this](DebuggerObserver* observer) { | 56 | ForEachObserver([this](DebuggerObserver* observer) { |
| 56 | observer->GXCommandProcessed(static_cast<int>(this->gx_command_history.size())); | 57 | observer->GXCommandProcessed(static_cast<int>(this->gx_command_history.size())); |
| 57 | }); | 58 | }); |
| 58 | } | 59 | } |
| 59 | 60 | ||
| 60 | const GSP_GPU::Command& ReadGXCommandHistory(int index) const { | 61 | const Service::GSP::Command& ReadGXCommandHistory(int index) const { |
| 61 | // TODO: Is this thread-safe? | 62 | // TODO: Is this thread-safe? |
| 62 | return gx_command_history[index]; | 63 | return gx_command_history[index]; |
| 63 | } | 64 | } |
| @@ -80,5 +81,5 @@ private: | |||
| 80 | 81 | ||
| 81 | std::vector<DebuggerObserver*> observers; | 82 | std::vector<DebuggerObserver*> observers; |
| 82 | 83 | ||
| 83 | std::vector<GSP_GPU::Command> gx_command_history; | 84 | std::vector<Service::GSP::Command> gx_command_history; |
| 84 | }; | 85 | }; |