Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-31 13:50:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

hw/gpu: pass in memory reference

Browse source
This commit is contained in:
Weiyi Wang 2018-11-21 11:53:10 -05:00
parent ec01975549
commit cfee59c6db
5 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/core.cpp
View file

@ -189,7 +189,7 @@ System::ResultStatus System::Init(EmuWindow& emu_window, u32 system_mode) {
cpu_core = std::make_unique<ARM_DynCom>(USER32MODE); cpu_core = std::make_unique<ARM_DynCom>(USER32MODE);
} }
dsp_core = std::make_unique<AudioCore::DspHle>(); dsp_core = std::make_unique<AudioCore::DspHle>(*memory);
dsp_core->SetSink(Settings::values.sink_id, Settings::values.audio_device_id); dsp_core->SetSink(Settings::values.sink_id, Settings::values.audio_device_id);
dsp_core->EnableStretching(Settings::values.enable_audio_stretching); dsp_core->EnableStretching(Settings::values.enable_audio_stretching);
@ -202,7 +202,7 @@ System::ResultStatus System::Init(EmuWindow& emu_window, u32 system_mode) {
service_manager = std::make_shared<Service::SM::ServiceManager>(*this); service_manager = std::make_shared<Service::SM::ServiceManager>(*this);
archive_manager = std::make_unique<Service::FS::ArchiveManager>(*this); archive_manager = std::make_unique<Service::FS::ArchiveManager>(*this);
HW::Init(); HW::Init(*memory);
Service::Init(*this); Service::Init(*this);
GDBStub::Init(); GDBStub::Init();

4
src/core/hw/gpu.cpp
View file

@ -27,6 +27,7 @@
namespace GPU { namespace GPU {
Regs g_regs; Regs g_regs;
Memory::MemorySystem* g_memory;
/// 268MHz CPU clocks / 60Hz frames per second /// 268MHz CPU clocks / 60Hz frames per second
const u64 frame_ticks = static_cast<u64>(BASE_CLOCK_RATE_ARM11 / SCREEN_REFRESH_RATE); const u64 frame_ticks = static_cast<u64>(BASE_CLOCK_RATE_ARM11 / SCREEN_REFRESH_RATE);
@ -526,7 +527,8 @@ static void VBlankCallback(u64 userdata, s64 cycles_late) {
} }
/// Initialize hardware /// Initialize hardware
void Init() { void Init(Memory::MemorySystem& memory) {
g_memory = &memory;
memset(&g_regs, 0, sizeof(g_regs)); memset(&g_regs, 0, sizeof(g_regs));
auto& framebuffer_top = g_regs.framebuffer_config[0]; auto& framebuffer_top = g_regs.framebuffer_config[0];

6
src/core/hw/gpu.h
View file

@ -11,6 +11,10 @@
#include "common/common_funcs.h" #include "common/common_funcs.h"
#include "common/common_types.h" #include "common/common_types.h"
namespace Memory {
class MemorySystem;
}
namespace GPU { namespace GPU {
constexpr float SCREEN_REFRESH_RATE = 60; constexpr float SCREEN_REFRESH_RATE = 60;
@ -326,7 +330,7 @@ template <typename T>
void Write(u32 addr, const T data); void Write(u32 addr, const T data);
/// Initialize hardware /// Initialize hardware
void Init(); void Init(Memory::MemorySystem& memory);
/// Shutdown hardware /// Shutdown hardware
void Shutdown(); void Shutdown();

4
src/core/hw/hw.cpp
View file

@ -86,9 +86,9 @@ template void Write<u8>(u32 addr, const u8 data);
void Update() {} void Update() {}
/// Initialize hardware /// Initialize hardware
void Init() { void Init(Memory::MemorySystem& memory) {
AES::InitKeys(); AES::InitKeys();
GPU::Init(); GPU::Init(memory);
LCD::Init(); LCD::Init();
LOG_DEBUG(HW, "initialized OK"); LOG_DEBUG(HW, "initialized OK");
} }

6
src/core/hw/hw.h
View file

@ -6,6 +6,10 @@
#include "common/common_types.h" #include "common/common_types.h"
namespace Memory {
class MemorySystem;
}
namespace HW { namespace HW {
/// Beginnings of IO register regions, in the user VA space. /// Beginnings of IO register regions, in the user VA space.
@ -42,7 +46,7 @@ void Write(u32 addr, const T data);
void Update(); void Update();
/// Initialize hardware /// Initialize hardware
void Init(); void Init(Memory::MemorySystem& memory);
/// Shutdown hardware /// Shutdown hardware
void Shutdown(); void Shutdown();