diff options
| author | 2020-01-02 22:03:30 -0500 | |
|---|---|---|
| committer | 2020-01-02 22:03:30 -0500 | |
| commit | c332c66eb206ccd68b5826c91e5f5fba1cf442e7 (patch) | |
| tree | 387e5129419845948ddfc3884be8acd69626f324 /src/core | |
| parent | Merge pull request #3243 from ReinUsesLisp/topologies (diff) | |
| parent | yuzu: Remove Maxwell debugger (diff) | |
| download | yuzu-c332c66eb206ccd68b5826c91e5f5fba1cf442e7.tar.gz yuzu-c332c66eb206ccd68b5826c91e5f5fba1cf442e7.tar.xz yuzu-c332c66eb206ccd68b5826c91e5f5fba1cf442e7.zip | |
Merge pull request #3267 from ReinUsesLisp/remove-maxwell-debugger
yuzu: Remove Maxwell debugger
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/core.cpp | 10 | ||||
| -rw-r--r-- | src/core/core.h | 4 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index c45fb960c..d697b80ef 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | #include "core/settings.h" | 46 | #include "core/settings.h" |
| 47 | #include "core/telemetry_session.h" | 47 | #include "core/telemetry_session.h" |
| 48 | #include "core/tools/freezer.h" | 48 | #include "core/tools/freezer.h" |
| 49 | #include "video_core/debug_utils/debug_utils.h" | ||
| 50 | #include "video_core/renderer_base.h" | 49 | #include "video_core/renderer_base.h" |
| 51 | #include "video_core/video_core.h" | 50 | #include "video_core/video_core.h" |
| 52 | 51 | ||
| @@ -341,7 +340,6 @@ struct System::Impl { | |||
| 341 | std::unique_ptr<Loader::AppLoader> app_loader; | 340 | std::unique_ptr<Loader::AppLoader> app_loader; |
| 342 | std::unique_ptr<VideoCore::RendererBase> renderer; | 341 | std::unique_ptr<VideoCore::RendererBase> renderer; |
| 343 | std::unique_ptr<Tegra::GPU> gpu_core; | 342 | std::unique_ptr<Tegra::GPU> gpu_core; |
| 344 | std::shared_ptr<Tegra::DebugContext> debug_context; | ||
| 345 | std::unique_ptr<Hardware::InterruptManager> interrupt_manager; | 343 | std::unique_ptr<Hardware::InterruptManager> interrupt_manager; |
| 346 | Memory::Memory memory; | 344 | Memory::Memory memory; |
| 347 | CpuCoreManager cpu_core_manager; | 345 | CpuCoreManager cpu_core_manager; |
| @@ -580,14 +578,6 @@ Loader::AppLoader& System::GetAppLoader() const { | |||
| 580 | return *impl->app_loader; | 578 | return *impl->app_loader; |
| 581 | } | 579 | } |
| 582 | 580 | ||
| 583 | void System::SetGPUDebugContext(std::shared_ptr<Tegra::DebugContext> context) { | ||
| 584 | impl->debug_context = std::move(context); | ||
| 585 | } | ||
| 586 | |||
| 587 | Tegra::DebugContext* System::GetGPUDebugContext() const { | ||
| 588 | return impl->debug_context.get(); | ||
| 589 | } | ||
| 590 | |||
| 591 | void System::SetFilesystem(std::shared_ptr<FileSys::VfsFilesystem> vfs) { | 581 | void System::SetFilesystem(std::shared_ptr<FileSys::VfsFilesystem> vfs) { |
| 592 | impl->virtual_filesystem = std::move(vfs); | 582 | impl->virtual_filesystem = std::move(vfs); |
| 593 | } | 583 | } |
diff --git a/src/core/core.h b/src/core/core.h index 91184e433..e240c5c58 100644 --- a/src/core/core.h +++ b/src/core/core.h | |||
| @@ -307,10 +307,6 @@ public: | |||
| 307 | Service::SM::ServiceManager& ServiceManager(); | 307 | Service::SM::ServiceManager& ServiceManager(); |
| 308 | const Service::SM::ServiceManager& ServiceManager() const; | 308 | const Service::SM::ServiceManager& ServiceManager() const; |
| 309 | 309 | ||
| 310 | void SetGPUDebugContext(std::shared_ptr<Tegra::DebugContext> context); | ||
| 311 | |||
| 312 | Tegra::DebugContext* GetGPUDebugContext() const; | ||
| 313 | |||
| 314 | void SetFilesystem(std::shared_ptr<FileSys::VfsFilesystem> vfs); | 310 | void SetFilesystem(std::shared_ptr<FileSys::VfsFilesystem> vfs); |
| 315 | 311 | ||
| 316 | std::shared_ptr<FileSys::VfsFilesystem> GetFilesystem() const; | 312 | std::shared_ptr<FileSys::VfsFilesystem> GetFilesystem() const; |