diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/settings.cpp | 1 | ||||
| -rw-r--r-- | src/core/settings.h | 1 | ||||
| -rw-r--r-- | src/yuzu/bootmanager.cpp | 8 | ||||
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics.ui | 7 | ||||
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp | 6 |
8 files changed, 3 insertions, 29 deletions
diff --git a/src/core/settings.cpp b/src/core/settings.cpp index c1365879b..6d32ebea3 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp | |||
| @@ -90,7 +90,6 @@ void LogSettings() { | |||
| 90 | LogSetting("Renderer_UseResolutionFactor", Settings::values.resolution_factor); | 90 | LogSetting("Renderer_UseResolutionFactor", Settings::values.resolution_factor); |
| 91 | LogSetting("Renderer_UseFrameLimit", Settings::values.use_frame_limit); | 91 | LogSetting("Renderer_UseFrameLimit", Settings::values.use_frame_limit); |
| 92 | LogSetting("Renderer_FrameLimit", Settings::values.frame_limit); | 92 | LogSetting("Renderer_FrameLimit", Settings::values.frame_limit); |
| 93 | LogSetting("Renderer_UseCompatibilityProfile", Settings::values.use_compatibility_profile); | ||
| 94 | LogSetting("Renderer_UseDiskShaderCache", Settings::values.use_disk_shader_cache); | 93 | LogSetting("Renderer_UseDiskShaderCache", Settings::values.use_disk_shader_cache); |
| 95 | LogSetting("Renderer_UseAccurateGpuEmulation", Settings::values.use_accurate_gpu_emulation); | 94 | LogSetting("Renderer_UseAccurateGpuEmulation", Settings::values.use_accurate_gpu_emulation); |
| 96 | LogSetting("Renderer_UseAsynchronousGpuEmulation", | 95 | LogSetting("Renderer_UseAsynchronousGpuEmulation", |
diff --git a/src/core/settings.h b/src/core/settings.h index 5ff3634aa..b84390745 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -390,7 +390,6 @@ struct Values { | |||
| 390 | float resolution_factor; | 390 | float resolution_factor; |
| 391 | bool use_frame_limit; | 391 | bool use_frame_limit; |
| 392 | u16 frame_limit; | 392 | u16 frame_limit; |
| 393 | bool use_compatibility_profile; | ||
| 394 | bool use_disk_shader_cache; | 393 | bool use_disk_shader_cache; |
| 395 | bool use_accurate_gpu_emulation; | 394 | bool use_accurate_gpu_emulation; |
| 396 | bool use_asynchronous_gpu_emulation; | 395 | bool use_asynchronous_gpu_emulation; |
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 9e420b359..5243fe820 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp | |||
| @@ -379,12 +379,8 @@ void GRenderWindow::InitRenderTarget() { | |||
| 379 | // WA_DontShowOnScreen, WA_DeleteOnClose | 379 | // WA_DontShowOnScreen, WA_DeleteOnClose |
| 380 | QSurfaceFormat fmt; | 380 | QSurfaceFormat fmt; |
| 381 | fmt.setVersion(4, 3); | 381 | fmt.setVersion(4, 3); |
| 382 | if (Settings::values.use_compatibility_profile) { | 382 | fmt.setProfile(QSurfaceFormat::CompatibilityProfile); |
| 383 | fmt.setProfile(QSurfaceFormat::CompatibilityProfile); | 383 | fmt.setOption(QSurfaceFormat::FormatOption::DeprecatedFunctions); |
| 384 | fmt.setOption(QSurfaceFormat::FormatOption::DeprecatedFunctions); | ||
| 385 | } else { | ||
| 386 | fmt.setProfile(QSurfaceFormat::CoreProfile); | ||
| 387 | } | ||
| 388 | // TODO: expose a setting for buffer value (ie default/single/double/triple) | 384 | // TODO: expose a setting for buffer value (ie default/single/double/triple) |
| 389 | fmt.setSwapBehavior(QSurfaceFormat::DefaultSwapBehavior); | 385 | fmt.setSwapBehavior(QSurfaceFormat::DefaultSwapBehavior); |
| 390 | shared_context = std::make_unique<QOpenGLContext>(); | 386 | shared_context = std::make_unique<QOpenGLContext>(); |
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index db27da23e..02a213e58 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -531,8 +531,6 @@ void Config::ReadRendererValues() { | |||
| 531 | Settings::values.use_frame_limit = | 531 | Settings::values.use_frame_limit = |
| 532 | ReadSetting(QStringLiteral("use_frame_limit"), true).toBool(); | 532 | ReadSetting(QStringLiteral("use_frame_limit"), true).toBool(); |
| 533 | Settings::values.frame_limit = ReadSetting(QStringLiteral("frame_limit"), 100).toInt(); | 533 | Settings::values.frame_limit = ReadSetting(QStringLiteral("frame_limit"), 100).toInt(); |
| 534 | Settings::values.use_compatibility_profile = | ||
| 535 | ReadSetting(QStringLiteral("use_compatibility_profile"), true).toBool(); | ||
| 536 | Settings::values.use_disk_shader_cache = | 534 | Settings::values.use_disk_shader_cache = |
| 537 | ReadSetting(QStringLiteral("use_disk_shader_cache"), true).toBool(); | 535 | ReadSetting(QStringLiteral("use_disk_shader_cache"), true).toBool(); |
| 538 | Settings::values.use_accurate_gpu_emulation = | 536 | Settings::values.use_accurate_gpu_emulation = |
| @@ -912,8 +910,6 @@ void Config::SaveRendererValues() { | |||
| 912 | static_cast<double>(Settings::values.resolution_factor), 1.0); | 910 | static_cast<double>(Settings::values.resolution_factor), 1.0); |
| 913 | WriteSetting(QStringLiteral("use_frame_limit"), Settings::values.use_frame_limit, true); | 911 | WriteSetting(QStringLiteral("use_frame_limit"), Settings::values.use_frame_limit, true); |
| 914 | WriteSetting(QStringLiteral("frame_limit"), Settings::values.frame_limit, 100); | 912 | WriteSetting(QStringLiteral("frame_limit"), Settings::values.frame_limit, 100); |
| 915 | WriteSetting(QStringLiteral("use_compatibility_profile"), | ||
| 916 | Settings::values.use_compatibility_profile, true); | ||
| 917 | WriteSetting(QStringLiteral("use_disk_shader_cache"), Settings::values.use_disk_shader_cache, | 913 | WriteSetting(QStringLiteral("use_disk_shader_cache"), Settings::values.use_disk_shader_cache, |
| 918 | true); | 914 | true); |
| 919 | WriteSetting(QStringLiteral("use_accurate_gpu_emulation"), | 915 | WriteSetting(QStringLiteral("use_accurate_gpu_emulation"), |
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 08ea41b0f..c01281ee1 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp | |||
| @@ -75,8 +75,6 @@ void ConfigureGraphics::setConfiguration() { | |||
| 75 | static_cast<int>(FromResolutionFactor(Settings::values.resolution_factor))); | 75 | static_cast<int>(FromResolutionFactor(Settings::values.resolution_factor))); |
| 76 | ui->toggle_frame_limit->setChecked(Settings::values.use_frame_limit); | 76 | ui->toggle_frame_limit->setChecked(Settings::values.use_frame_limit); |
| 77 | ui->frame_limit->setValue(Settings::values.frame_limit); | 77 | ui->frame_limit->setValue(Settings::values.frame_limit); |
| 78 | ui->use_compatibility_profile->setEnabled(runtime_lock); | ||
| 79 | ui->use_compatibility_profile->setChecked(Settings::values.use_compatibility_profile); | ||
| 80 | ui->use_disk_shader_cache->setEnabled(runtime_lock); | 78 | ui->use_disk_shader_cache->setEnabled(runtime_lock); |
| 81 | ui->use_disk_shader_cache->setChecked(Settings::values.use_disk_shader_cache); | 79 | ui->use_disk_shader_cache->setChecked(Settings::values.use_disk_shader_cache); |
| 82 | ui->use_accurate_gpu_emulation->setChecked(Settings::values.use_accurate_gpu_emulation); | 80 | ui->use_accurate_gpu_emulation->setChecked(Settings::values.use_accurate_gpu_emulation); |
| @@ -93,7 +91,6 @@ void ConfigureGraphics::applyConfiguration() { | |||
| 93 | ToResolutionFactor(static_cast<Resolution>(ui->resolution_factor_combobox->currentIndex())); | 91 | ToResolutionFactor(static_cast<Resolution>(ui->resolution_factor_combobox->currentIndex())); |
| 94 | Settings::values.use_frame_limit = ui->toggle_frame_limit->isChecked(); | 92 | Settings::values.use_frame_limit = ui->toggle_frame_limit->isChecked(); |
| 95 | Settings::values.frame_limit = ui->frame_limit->value(); | 93 | Settings::values.frame_limit = ui->frame_limit->value(); |
| 96 | Settings::values.use_compatibility_profile = ui->use_compatibility_profile->isChecked(); | ||
| 97 | Settings::values.use_disk_shader_cache = ui->use_disk_shader_cache->isChecked(); | 94 | Settings::values.use_disk_shader_cache = ui->use_disk_shader_cache->isChecked(); |
| 98 | Settings::values.use_accurate_gpu_emulation = ui->use_accurate_gpu_emulation->isChecked(); | 95 | Settings::values.use_accurate_gpu_emulation = ui->use_accurate_gpu_emulation->isChecked(); |
| 99 | Settings::values.use_asynchronous_gpu_emulation = | 96 | Settings::values.use_asynchronous_gpu_emulation = |
diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui index 0f6f6c003..15ab18ecd 100644 --- a/src/yuzu/configuration/configure_graphics.ui +++ b/src/yuzu/configuration/configure_graphics.ui | |||
| @@ -50,13 +50,6 @@ | |||
| 50 | </layout> | 50 | </layout> |
| 51 | </item> | 51 | </item> |
| 52 | <item> | 52 | <item> |
| 53 | <widget class="QCheckBox" name="use_compatibility_profile"> | ||
| 54 | <property name="text"> | ||
| 55 | <string>Use OpenGL compatibility profile</string> | ||
| 56 | </property> | ||
| 57 | </widget> | ||
| 58 | </item> | ||
| 59 | <item> | ||
| 60 | <widget class="QCheckBox" name="use_disk_shader_cache"> | 53 | <widget class="QCheckBox" name="use_disk_shader_cache"> |
| 61 | <property name="text"> | 54 | <property name="text"> |
| 62 | <string>Use disk shader cache</string> | 55 | <string>Use disk shader cache</string> |
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 730956427..f3817bb87 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp | |||
| @@ -349,8 +349,6 @@ void Config::ReadValues() { | |||
| 349 | Settings::values.use_frame_limit = sdl2_config->GetBoolean("Renderer", "use_frame_limit", true); | 349 | Settings::values.use_frame_limit = sdl2_config->GetBoolean("Renderer", "use_frame_limit", true); |
| 350 | Settings::values.frame_limit = | 350 | Settings::values.frame_limit = |
| 351 | static_cast<u16>(sdl2_config->GetInteger("Renderer", "frame_limit", 100)); | 351 | static_cast<u16>(sdl2_config->GetInteger("Renderer", "frame_limit", 100)); |
| 352 | Settings::values.use_compatibility_profile = | ||
| 353 | sdl2_config->GetBoolean("Renderer", "use_compatibility_profile", true); | ||
| 354 | Settings::values.use_disk_shader_cache = | 352 | Settings::values.use_disk_shader_cache = |
| 355 | sdl2_config->GetBoolean("Renderer", "use_disk_shader_cache", false); | 353 | sdl2_config->GetBoolean("Renderer", "use_disk_shader_cache", false); |
| 356 | Settings::values.use_accurate_gpu_emulation = | 354 | Settings::values.use_accurate_gpu_emulation = |
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp index 904022137..e2d3df180 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp | |||
| @@ -74,13 +74,9 @@ bool EmuWindow_SDL2_GL::SupportsRequiredGLExtensions() { | |||
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(bool fullscreen) : EmuWindow_SDL2(fullscreen) { | 76 | EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(bool fullscreen) : EmuWindow_SDL2(fullscreen) { |
| 77 | const SDL_GLprofile profile = Settings::values.use_compatibility_profile | ||
| 78 | ? SDL_GL_CONTEXT_PROFILE_COMPATIBILITY | ||
| 79 | : SDL_GL_CONTEXT_PROFILE_CORE; | ||
| 80 | |||
| 81 | SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4); | 77 | SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4); |
| 82 | SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3); | 78 | SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3); |
| 83 | SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profile); | 79 | SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY); |
| 84 | SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); | 80 | SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); |
| 85 | SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8); | 81 | SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8); |
| 86 | SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8); | 82 | SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8); |