summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd
diff options
context:
space:
mode:
authorGravatar Zach Hilman2019-06-07 17:23:25 -0400
committerGravatar GitHub2019-06-07 17:23:25 -0400
commitde33ad25f52960449a97caa2b25e37e6a35f0710 (patch)
tree5f70bb84aafac68b6c34c95fec033528bff26d4e /src/yuzu_cmd
parentMerge pull request #2558 from ReinUsesLisp/shader-nodes (diff)
parentgl_buffer_cache: Remove unused ReserveMemory method (diff)
downloadyuzu-de33ad25f52960449a97caa2b25e37e6a35f0710.tar.gz
yuzu-de33ad25f52960449a97caa2b25e37e6a35f0710.tar.xz
yuzu-de33ad25f52960449a97caa2b25e37e6a35f0710.zip
Merge pull request #2514 from ReinUsesLisp/opengl-compat
video_core: Drop OpenGL core in favor of OpenGL compatibility
Diffstat (limited to 'src/yuzu_cmd')
-rw-r--r--src/yuzu_cmd/config.cpp2
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp6
2 files changed, 1 insertions, 7 deletions
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
76EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(bool fullscreen) : EmuWindow_SDL2(fullscreen) { 76EmuWindow_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);