summaryrefslogtreecommitdiff
path: root/src/core/hw/gpu.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-01-16 19:38:35 -0300
committerGravatar GitHub2017-01-16 19:38:35 -0300
commit55c91ae782f9a05411ba869f7a83de87d29a0adf (patch)
treef40e211ce132a79fa9dbff5a74980d0a84bde3ff /src/core/hw/gpu.cpp
parentMerge pull request #2435 from mailwl/gsp-mask (diff)
parentCoreTiming: use named constant for ARM11 clock rate (diff)
downloadyuzu-55c91ae782f9a05411ba869f7a83de87d29a0adf.tar.gz
yuzu-55c91ae782f9a05411ba869f7a83de87d29a0adf.tar.xz
yuzu-55c91ae782f9a05411ba869f7a83de87d29a0adf.zip
Merge pull request #2442 from wwylele/hid-signal
HID: manages updating itself using correct ticks
Diffstat (limited to 'src/core/hw/gpu.cpp')
-rw-r--r--src/core/hw/gpu.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index 1a1ee90b2..fa8c13d36 100644
--- a/src/core/hw/gpu.cpp
+++ b/src/core/hw/gpu.cpp
@@ -15,7 +15,6 @@
15#include "common/vector_math.h" 15#include "common/vector_math.h"
16#include "core/core_timing.h" 16#include "core/core_timing.h"
17#include "core/hle/service/gsp_gpu.h" 17#include "core/hle/service/gsp_gpu.h"
18#include "core/hle/service/hid/hid.h"
19#include "core/hw/gpu.h" 18#include "core/hw/gpu.h"
20#include "core/hw/hw.h" 19#include "core/hw/hw.h"
21#include "core/memory.h" 20#include "core/memory.h"
@@ -33,7 +32,7 @@ namespace GPU {
33Regs g_regs; 32Regs g_regs;
34 33
35/// 268MHz CPU clocks / 60Hz frames per second 34/// 268MHz CPU clocks / 60Hz frames per second
36const u64 frame_ticks = 268123480ull / 60; 35const u64 frame_ticks = BASE_CLOCK_RATE_ARM11 / 60;
37/// Event id for CoreTiming 36/// Event id for CoreTiming
38static int vblank_event; 37static int vblank_event;
39/// Total number of frames drawn 38/// Total number of frames drawn
@@ -551,9 +550,6 @@ static void VBlankCallback(u64 userdata, int cycles_late) {
551 Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PDC0); 550 Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PDC0);
552 Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PDC1); 551 Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PDC1);
553 552
554 // Check for user input updates
555 Service::HID::Update();
556
557 if (!Settings::values.use_vsync && Settings::values.toggle_framelimit) { 553 if (!Settings::values.use_vsync && Settings::values.toggle_framelimit) {
558 FrameLimiter(); 554 FrameLimiter();
559 } 555 }