OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-22 18:10:07 +00:00
Code Issues Projects Releases Wiki Activity

HW: Properly initialize and shutdown all modules.

Browse Source
This commit is contained in:
bunnei 2015-04-27 22:03:35 -04:00
parent e0cb85691a
commit 57aaaf92db
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/hw/gpu.cpp
View File

@ -29,8 +29,7 @@ namespace GPU {
Regs g_regs; Regs g_regs;
/// True if the current frame was skipped /// True if the current frame was skipped
bool g_skip_frame = false; bool g_skip_frame;
/// 268MHz / gpu_refresh_rate frames per second /// 268MHz / gpu_refresh_rate frames per second
static u64 frame_ticks; static u64 frame_ticks;
/// Event id for CoreTiming /// Event id for CoreTiming
@ -38,7 +37,7 @@ static int vblank_event;
/// Total number of frames drawn /// Total number of frames drawn
static u64 frame_count; static u64 frame_count;
/// True if the last frame was skipped /// True if the last frame was skipped
static bool last_skip_frame = false; static bool last_skip_frame;
template <typename T> template <typename T>
inline void Read(T &var, const u32 raw_addr) { inline void Read(T &var, const u32 raw_addr) {
@ -320,6 +319,8 @@ static void VBlankCallback(u64 userdata, int cycles_late) {
/// Initialize hardware /// Initialize hardware
void Init() { void Init() {
memset(&g_regs, 0, sizeof(g_regs));
auto& framebuffer_top = g_regs.framebuffer_config[0]; auto& framebuffer_top = g_regs.framebuffer_config[0];
auto& framebuffer_sub = g_regs.framebuffer_config[1]; auto& framebuffer_sub = g_regs.framebuffer_config[1];
@ -349,6 +350,7 @@ void Init() {
frame_ticks = 268123480 / Settings::values.gpu_refresh_rate; frame_ticks = 268123480 / Settings::values.gpu_refresh_rate;
last_skip_frame = false; last_skip_frame = false;
g_skip_frame = false; g_skip_frame = false;
frame_count = 0;
vblank_event = CoreTiming::RegisterEvent("GPU::VBlankCallback", VBlankCallback); vblank_event = CoreTiming::RegisterEvent("GPU::VBlankCallback", VBlankCallback);
CoreTiming::ScheduleEvent(frame_ticks, vblank_event); CoreTiming::ScheduleEvent(frame_ticks, vblank_event);

2
src/core/hw/hw.cpp
View File

@ -63,6 +63,8 @@ void Init() {
/// Shutdown hardware /// Shutdown hardware
void Shutdown() { void Shutdown() {
GPU::Shutdown();
LCD::Shutdown();
LOG_DEBUG(HW, "shutdown OK"); LOG_DEBUG(HW, "shutdown OK");
} }

1
src/core/hw/lcd.cpp
View File

@ -55,6 +55,7 @@ template void Write<u8>(u32 addr, const u8 data);
/// Initialize hardware /// Initialize hardware
void Init() { void Init() {
memset(&g_regs, 0, sizeof(g_regs));
LOG_DEBUG(HW_LCD, "initialized OK"); LOG_DEBUG(HW_LCD, "initialized OK");
} }