diff options
| author | 2015-07-22 23:25:30 -0400 | |
|---|---|---|
| committer | 2015-08-15 18:01:07 -0400 | |
| commit | 094ae6fadb57883e25d412443fcae987ddf240ef (patch) | |
| tree | 8817c9b0672bd02be3fa32a02f3f126f0ecfb664 /src/citra_qt/main.cpp | |
| parent | Common: Added MurmurHash3 hash function for general-purpose use. (diff) | |
| download | yuzu-094ae6fadb57883e25d412443fcae987ddf240ef.tar.gz yuzu-094ae6fadb57883e25d412443fcae987ddf240ef.tar.xz yuzu-094ae6fadb57883e25d412443fcae987ddf240ef.zip | |
Shader: Initial implementation of x86_x64 JIT compiler for Pica vertex shaders.
- Config: Add an option for selecting to use shader JIT or interpreter.
- Qt: Add a menu option for enabling/disabling the shader JIT.
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 6b030c178..4c3edf87a 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -131,6 +131,9 @@ GMainWindow::GMainWindow() : emu_thread(nullptr) | |||
| 131 | ui.action_Use_Hardware_Renderer->setChecked(Settings::values.use_hw_renderer); | 131 | ui.action_Use_Hardware_Renderer->setChecked(Settings::values.use_hw_renderer); |
| 132 | SetHardwareRendererEnabled(ui.action_Use_Hardware_Renderer->isChecked()); | 132 | SetHardwareRendererEnabled(ui.action_Use_Hardware_Renderer->isChecked()); |
| 133 | 133 | ||
| 134 | ui.action_Use_Shader_JIT->setChecked(Settings::values.use_shader_jit); | ||
| 135 | SetShaderJITEnabled(ui.action_Use_Shader_JIT->isChecked()); | ||
| 136 | |||
| 134 | ui.action_Single_Window_Mode->setChecked(settings.value("singleWindowMode", true).toBool()); | 137 | ui.action_Single_Window_Mode->setChecked(settings.value("singleWindowMode", true).toBool()); |
| 135 | ToggleWindowMode(); | 138 | ToggleWindowMode(); |
| 136 | 139 | ||
| @@ -144,6 +147,7 @@ GMainWindow::GMainWindow() : emu_thread(nullptr) | |||
| 144 | connect(ui.action_Pause, SIGNAL(triggered()), this, SLOT(OnPauseGame())); | 147 | connect(ui.action_Pause, SIGNAL(triggered()), this, SLOT(OnPauseGame())); |
| 145 | connect(ui.action_Stop, SIGNAL(triggered()), this, SLOT(OnStopGame())); | 148 | connect(ui.action_Stop, SIGNAL(triggered()), this, SLOT(OnStopGame())); |
| 146 | connect(ui.action_Use_Hardware_Renderer, SIGNAL(triggered(bool)), this, SLOT(SetHardwareRendererEnabled(bool))); | 149 | connect(ui.action_Use_Hardware_Renderer, SIGNAL(triggered(bool)), this, SLOT(SetHardwareRendererEnabled(bool))); |
| 150 | connect(ui.action_Use_Shader_JIT, SIGNAL(triggered(bool)), this, SLOT(SetShaderJITEnabled(bool))); | ||
| 147 | connect(ui.action_Single_Window_Mode, SIGNAL(triggered(bool)), this, SLOT(ToggleWindowMode())); | 151 | connect(ui.action_Single_Window_Mode, SIGNAL(triggered(bool)), this, SLOT(ToggleWindowMode())); |
| 148 | connect(ui.action_Hotkeys, SIGNAL(triggered()), this, SLOT(OnOpenHotkeysDialog())); | 152 | connect(ui.action_Hotkeys, SIGNAL(triggered()), this, SLOT(OnOpenHotkeysDialog())); |
| 149 | 153 | ||
| @@ -331,6 +335,10 @@ void GMainWindow::SetHardwareRendererEnabled(bool enabled) { | |||
| 331 | VideoCore::g_hw_renderer_enabled = enabled; | 335 | VideoCore::g_hw_renderer_enabled = enabled; |
| 332 | } | 336 | } |
| 333 | 337 | ||
| 338 | void GMainWindow::SetShaderJITEnabled(bool enabled) { | ||
| 339 | VideoCore::g_shader_jit_enabled = enabled; | ||
| 340 | } | ||
| 341 | |||
| 334 | void GMainWindow::ToggleWindowMode() { | 342 | void GMainWindow::ToggleWindowMode() { |
| 335 | if (ui.action_Single_Window_Mode->isChecked()) { | 343 | if (ui.action_Single_Window_Mode->isChecked()) { |
| 336 | // Render in the main window... | 344 | // Render in the main window... |