Merge pull request #34 from bunnei/gsp-command-synch

Gsp command synch

1 files changed, 22 insertions, 5 deletions

diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index c00be2a83..d94c2329b 100644
--- a/src/core/hw/gpu.cpp
+++ b/src/core/hw/gpu.cpp
@@ -7,7 +7,11 @@
 
 #include "core/core.h"
 #include "core/mem_map.h"
+
+#include "core/hle/hle.h"
 #include "core/hle/kernel/thread.h"
+#include "core/hle/service/gsp.h"
+
 #include "core/hw/gpu.h"
 
 #include "video_core/video_core.h"
@@ -17,7 +21,8 @@ namespace GPU {
 
 RegisterSet<u32, Regs> g_regs;
 
-u64 g_last_ticks = 0; ///< Last CPU ticks
+u32 g_cur_line = 0;         ///< Current vertical screen line
+u64 g_last_line_ticks = 0;  ///< CPU tick count from last vertical screen line
 
 /**
  * Sets whether the framebuffers are in the GSP heap (FCRAM) or VRAM
@@ -247,19 +252,31 @@ template void Write<u8>(u32 addr, const u8 data);
 
 /// Update hardware
 void Update() {
+    auto& framebuffer_top = g_regs.Get<Regs::FramebufferTop>();
     u64 current_ticks = Core::g_app_core->GetTicks();
 
-    // Fake a vertical blank
-    if ((current_ticks - g_last_ticks) >= kFrameTicks) {
-        g_last_ticks = current_ticks;
+    // Synchronize line...
+    if ((current_ticks - g_last_line_ticks) >= GPU::kFrameTicks / framebuffer_top.height) {
+        GSP_GPU::SignalInterrupt(GSP_GPU::InterruptId::PDC0);
+        g_cur_line++;
+        g_last_line_ticks = current_ticks;
+    }
+
+    // Synchronize frame...
+    if (g_cur_line >= framebuffer_top.height) {
+        g_cur_line = 0;
+        GSP_GPU::SignalInterrupt(GSP_GPU::InterruptId::PDC1);
         VideoCore::g_renderer->SwapBuffers();
         Kernel::WaitCurrentThread(WAITTYPE_VBLANK);
+        HLE::Reschedule(__func__);
     }
 }
 
 /// Initialize hardware
 void Init() {
-    g_last_ticks = Core::g_app_core->GetTicks();
+    g_cur_line = 0;
+    g_last_line_ticks = Core::g_app_core->GetTicks();
+
 //    SetFramebufferLocation(FRAMEBUFFER_LOCATION_FCRAM);
     SetFramebufferLocation(FRAMEBUFFER_LOCATION_VRAM);