mirrors/yuzu
2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00
Code Issues Releases Activity

dma_pusher: Remove reliance on the global system instance

Browse source 
With this, the video core is now has no calls to the global system
instance at all.
This commit is contained in:
Lioncash 2020-04-19 16:12:06 -04:00
parent 2ea7a70da0
commit 44e959157b
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/video_core/dma_pusher.cpp
View file

@ -12,7 +12,7 @@
namespace Tegra { namespace Tegra {
DmaPusher::DmaPusher(GPU& gpu) : gpu(gpu) {} DmaPusher::DmaPusher(Core::System& system, GPU& gpu) : gpu{gpu}, system{system} {}
DmaPusher::~DmaPusher() = default; DmaPusher::~DmaPusher() = default;
@ -26,7 +26,7 @@ void DmaPusher::DispatchCalls() {
dma_pushbuffer_subindex = 0; dma_pushbuffer_subindex = 0;
while (Core::System::GetInstance().IsPoweredOn()) { while (system.IsPoweredOn()) {
if (!Step()) { if (!Step()) {
break; break;
} }

11
src/video_core/dma_pusher.h
View file

@ -10,6 +10,10 @@
#include "common/bit_field.h" #include "common/bit_field.h"
#include "common/common_types.h" #include "common/common_types.h"
namespace Core {
class System;
}
namespace Tegra { namespace Tegra {
enum class SubmissionMode : u32 { enum class SubmissionMode : u32 {
@ -56,7 +60,7 @@ using CommandList = std::vector<Tegra::CommandListHeader>;
*/ */
class DmaPusher { class DmaPusher {
public: public:
explicit DmaPusher(GPU& gpu); explicit DmaPusher(Core::System& system, GPU& gpu);
~DmaPusher(); ~DmaPusher();
void Push(CommandList&& entries) { void Push(CommandList&& entries) {
@ -72,8 +76,6 @@ private:
void CallMethod(u32 argument) const; void CallMethod(u32 argument) const;
GPU& gpu;
std::vector<CommandHeader> command_headers; ///< Buffer for list of commands fetched at once std::vector<CommandHeader> command_headers; ///< Buffer for list of commands fetched at once
std::queue<CommandList> dma_pushbuffer; ///< Queue of command lists to be processed std::queue<CommandList> dma_pushbuffer; ///< Queue of command lists to be processed
@ -92,6 +94,9 @@ private:
GPUVAddr dma_mget{}; ///< main pushbuffer last read address GPUVAddr dma_mget{}; ///< main pushbuffer last read address
bool ib_enable{true}; ///< IB mode enabled bool ib_enable{true}; ///< IB mode enabled
GPU& gpu;
Core::System& system;
}; };
} // namespace Tegra } // namespace Tegra

2
src/video_core/gpu.cpp
View file

@ -27,7 +27,7 @@ GPU::GPU(Core::System& system, std::unique_ptr<VideoCore::RendererBase>&& render
: system{system}, renderer{std::move(renderer_)}, is_async{is_async} { : system{system}, renderer{std::move(renderer_)}, is_async{is_async} {
auto& rasterizer{renderer->Rasterizer()}; auto& rasterizer{renderer->Rasterizer()};
memory_manager = std::make_unique<Tegra::MemoryManager>(system, rasterizer); memory_manager = std::make_unique<Tegra::MemoryManager>(system, rasterizer);
dma_pusher = std::make_unique<Tegra::DmaPusher>(*this); dma_pusher = std::make_unique<Tegra::DmaPusher>(system, *this);
maxwell_3d = std::make_unique<Engines::Maxwell3D>(system, rasterizer, *memory_manager); maxwell_3d = std::make_unique<Engines::Maxwell3D>(system, rasterizer, *memory_manager);
fermi_2d = std::make_unique<Engines::Fermi2D>(rasterizer); fermi_2d = std::make_unique<Engines::Fermi2D>(rasterizer);
kepler_compute = std::make_unique<Engines::KeplerCompute>(system, rasterizer, *memory_manager); kepler_compute = std::make_unique<Engines::KeplerCompute>(system, rasterizer, *memory_manager);