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 | |
| 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')
| -rw-r--r-- | src/citra/citra.cpp | 1 | ||||
| -rw-r--r-- | src/citra/config.cpp | 1 | ||||
| -rw-r--r-- | src/citra/default_ini.h | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 182646f4c..d6fcb66a5 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp | |||
| @@ -71,6 +71,7 @@ int main(int argc, char **argv) { | |||
| 71 | EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; | 71 | EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; |
| 72 | 72 | ||
| 73 | VideoCore::g_hw_renderer_enabled = Settings::values.use_hw_renderer; | 73 | VideoCore::g_hw_renderer_enabled = Settings::values.use_hw_renderer; |
| 74 | VideoCore::g_shader_jit_enabled = Settings::values.use_shader_jit; | ||
| 74 | 75 | ||
| 75 | System::Init(emu_window); | 76 | System::Init(emu_window); |
| 76 | 77 | ||
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 2c1407a6f..8a98bda87 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp | |||
| @@ -61,6 +61,7 @@ void Config::ReadValues() { | |||
| 61 | 61 | ||
| 62 | // Renderer | 62 | // Renderer |
| 63 | Settings::values.use_hw_renderer = glfw_config->GetBoolean("Renderer", "use_hw_renderer", false); | 63 | Settings::values.use_hw_renderer = glfw_config->GetBoolean("Renderer", "use_hw_renderer", false); |
| 64 | Settings::values.use_shader_jit = glfw_config->GetBoolean("Renderer", "use_shader_jit", true); | ||
| 64 | 65 | ||
| 65 | Settings::values.bg_red = (float)glfw_config->GetReal("Renderer", "bg_red", 1.0); | 66 | Settings::values.bg_red = (float)glfw_config->GetReal("Renderer", "bg_red", 1.0); |
| 66 | Settings::values.bg_green = (float)glfw_config->GetReal("Renderer", "bg_green", 1.0); | 67 | Settings::values.bg_green = (float)glfw_config->GetReal("Renderer", "bg_green", 1.0); |
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index 1925bece8..7e5d49729 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h | |||
| @@ -42,6 +42,10 @@ frame_skip = | |||
| 42 | # 0 (default): Software, 1: Hardware | 42 | # 0 (default): Software, 1: Hardware |
| 43 | use_hw_renderer = | 43 | use_hw_renderer = |
| 44 | 44 | ||
| 45 | # Whether to use the Just-In-Time (JIT) compiler for shader emulation | ||
| 46 | # 0 : Interpreter (slow), 1 (default): JIT (fast) | ||
| 47 | use_shader_jit = | ||
| 48 | |||
| 45 | # The clear color for the renderer. What shows up on the sides of the bottom screen. | 49 | # The clear color for the renderer. What shows up on the sides of the bottom screen. |
| 46 | # Must be in range of 0.0-1.0. Defaults to 1.0 for all. | 50 | # Must be in range of 0.0-1.0. Defaults to 1.0 for all. |
| 47 | bg_red = | 51 | bg_red = |