diff options
| author | 2016-08-31 22:20:54 -0400 | |
|---|---|---|
| committer | 2016-08-31 22:20:54 -0400 | |
| commit | 09063dc5bb1e2b769c10077bf820a5300494c119 (patch) | |
| tree | ad997ee86470e23e9dfa67a1d9824a57cdcf5571 /src/core | |
| parent | Merge pull request #2035 from MerryMage/disable-stretch (diff) | |
| parent | qt: Rename all "toogle" to "toggle". (diff) | |
| download | yuzu-09063dc5bb1e2b769c10077bf820a5300494c119.tar.gz yuzu-09063dc5bb1e2b769c10077bf820a5300494c119.tar.xz yuzu-09063dc5bb1e2b769c10077bf820a5300494c119.zip | |
Merge pull request #2032 from bunnei/qt-graphics
Qt graphics configure & V-Sync option
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/settings.h | 1 | ||||
| -rw-r--r-- | src/core/system.cpp | 10 | ||||
| -rw-r--r-- | src/core/system.h | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index 0962a4ecf..fb3fbe391 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -72,6 +72,7 @@ struct Values { | |||
| 72 | bool use_hw_renderer; | 72 | bool use_hw_renderer; |
| 73 | bool use_shader_jit; | 73 | bool use_shader_jit; |
| 74 | bool use_scaled_resolution; | 74 | bool use_scaled_resolution; |
| 75 | bool use_vsync; | ||
| 75 | 76 | ||
| 76 | float bg_red; | 77 | float bg_red; |
| 77 | float bg_green; | 78 | float bg_green; |
diff --git a/src/core/system.cpp b/src/core/system.cpp index 4a4757af3..4fc266cb0 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp | |||
| @@ -17,6 +17,8 @@ | |||
| 17 | 17 | ||
| 18 | namespace System { | 18 | namespace System { |
| 19 | 19 | ||
| 20 | static bool is_powered_on{ false }; | ||
| 21 | |||
| 20 | Result Init(EmuWindow* emu_window) { | 22 | Result Init(EmuWindow* emu_window) { |
| 21 | Core::Init(); | 23 | Core::Init(); |
| 22 | CoreTiming::Init(); | 24 | CoreTiming::Init(); |
| @@ -30,9 +32,15 @@ Result Init(EmuWindow* emu_window) { | |||
| 30 | AudioCore::Init(); | 32 | AudioCore::Init(); |
| 31 | GDBStub::Init(); | 33 | GDBStub::Init(); |
| 32 | 34 | ||
| 35 | is_powered_on = true; | ||
| 36 | |||
| 33 | return Result::Success; | 37 | return Result::Success; |
| 34 | } | 38 | } |
| 35 | 39 | ||
| 40 | bool IsPoweredOn() { | ||
| 41 | return is_powered_on; | ||
| 42 | } | ||
| 43 | |||
| 36 | void Shutdown() { | 44 | void Shutdown() { |
| 37 | GDBStub::Shutdown(); | 45 | GDBStub::Shutdown(); |
| 38 | AudioCore::Shutdown(); | 46 | AudioCore::Shutdown(); |
| @@ -42,6 +50,8 @@ void Shutdown() { | |||
| 42 | HW::Shutdown(); | 50 | HW::Shutdown(); |
| 43 | CoreTiming::Shutdown(); | 51 | CoreTiming::Shutdown(); |
| 44 | Core::Shutdown(); | 52 | Core::Shutdown(); |
| 53 | |||
| 54 | is_powered_on = false; | ||
| 45 | } | 55 | } |
| 46 | 56 | ||
| 47 | } // namespace | 57 | } // namespace |
diff --git a/src/core/system.h b/src/core/system.h index a4a627ea9..fb0ca4e1b 100644 --- a/src/core/system.h +++ b/src/core/system.h | |||
| @@ -16,6 +16,7 @@ enum class Result { | |||
| 16 | }; | 16 | }; |
| 17 | 17 | ||
| 18 | Result Init(EmuWindow* emu_window); | 18 | Result Init(EmuWindow* emu_window); |
| 19 | bool IsPoweredOn(); | ||
| 19 | void Shutdown(); | 20 | void Shutdown(); |
| 20 | 21 | ||
| 21 | } | 22 | } |