VERY experimental Nintendo Switch 2 emulator
C++
gl_device: Use a more robust way to use strict context mode
Alexander Orzechowski9e0510f77d0f
diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.hindex 95363b645e..cf85ba29eb 100644--- a/src/core/frontend/emu_window.h+++ b/src/core/frontend/emu_window.h@@ -131,6 +131,10 @@ public:return active_config;}+ bool StrictContextRequired() const {+ return strict_context_required;+ }+/*** Requests the internal configuration to be replaced by the specified argument at some point in* the future.@@ -207,6 +211,8 @@ protected:WindowSystemInfo window_info;+ bool strict_context_required = false;+private:/*** Handler called when the minimal client area was requested to be changed via SetConfig.diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cppindex 4c5020defc..cee5c32470 100644--- a/src/video_core/renderer_opengl/gl_device.cpp+++ b/src/video_core/renderer_opengl/gl_device.cpp@@ -112,7 +112,7 @@ bool IsASTCSupported() {}} // Anonymous namespace-Device::Device() {+Device::Device(Core::Frontend::EmuWindow& emu_window) {if (!GLAD_GL_VERSION_4_6) {LOG_ERROR(Render_OpenGL, "OpenGL 4.6 is not available");throw std::runtime_error{"Insufficient version"};@@ -127,10 +127,8 @@ Device::Device() {#ifdef __unix__constexpr bool is_linux = true;- const bool is_wayland = strcasecmp(getenv("XDG_SESSION_TYPE"), "wayland") == 0;#elseconstexpr bool is_linux = false;- constexpr bool is_wayland = false;#endifbool disable_fast_buffer_sub_data = false;@@ -195,12 +193,12 @@ Device::Device() {}}+ strict_context_required = emu_window.StrictContextRequired();// Blocks AMD and Intel OpenGL drivers on Windows from using asynchronous shader compilation.// Blocks EGL on Wayland from using asynchronous shader compilation.use_asynchronous_shaders = Settings::values.use_asynchronous_shaders.GetValue() &&- !(is_amd || (is_intel && !is_linux)) && !is_wayland;+ !(is_amd || (is_intel && !is_linux)) && !strict_context_required;use_driver_cache = is_nvidia;- strict_context_required = is_wayland;LOG_INFO(Render_OpenGL, "Renderer_VariableAOFFI: {}", has_variable_aoffi);LOG_INFO(Render_OpenGL, "Renderer_ComponentIndexingBug: {}", has_component_indexing_bug);diff --git a/src/video_core/renderer_opengl/gl_device.h b/src/video_core/renderer_opengl/gl_device.hindex adb79c56e8..2a72d84be0 100644--- a/src/video_core/renderer_opengl/gl_device.h+++ b/src/video_core/renderer_opengl/gl_device.h@@ -5,6 +5,7 @@#include <cstddef>#include "common/common_types.h"+#include "core/frontend/emu_window.h"#include "shader_recompiler/stage.h"namespace Settings {@@ -15,7 +16,7 @@ namespace OpenGL {class Device {public:- explicit Device();+ explicit Device(Core::Frontend::EmuWindow& emu_window);[[nodiscard]] std::string GetVendorName() const;diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cppindex 5b5e178adf..bc75680f0a 100644--- a/src/video_core/renderer_opengl/renderer_opengl.cpp+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp@@ -140,8 +140,8 @@ RendererOpenGL::RendererOpenGL(Core::TelemetrySession& telemetry_session_,Core::Memory::Memory& cpu_memory_, Tegra::GPU& gpu_,std::unique_ptr<Core::Frontend::GraphicsContext> context_): RendererBase{emu_window_, std::move(context_)}, telemetry_session{telemetry_session_},- emu_window{emu_window_}, cpu_memory{cpu_memory_}, gpu{gpu_}, state_tracker{},- program_manager{device},+ emu_window{emu_window_}, cpu_memory{cpu_memory_}, gpu{gpu_}, device{emu_window_},+ state_tracker{}, program_manager{device},rasterizer(emu_window, gpu, cpu_memory, device, screen_info, program_manager, state_tracker) {if (Settings::values.renderer_debug && GLAD_GL_KHR_debug) {glEnable(GL_DEBUG_OUTPUT);diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cppindex 0ba7fff7a3..1a47fb9c96 100644--- a/src/yuzu/bootmanager.cpp+++ b/src/yuzu/bootmanager.cpp@@ -314,6 +314,8 @@ GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_,input_subsystem->Initialize();this->setMouseTracking(true);+ strict_context_required = QGuiApplication::platformName() == QStringLiteral("wayland");+connect(this, &GRenderWindow::FirstFrameDisplayed, parent, &GMainWindow::OnLoadComplete);connect(this, &GRenderWindow::ExecuteProgramSignal, parent, &GMainWindow::OnExecuteProgram,Qt::QueuedConnection);diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cppindex 9b660c13ce..ddcb048d64 100644--- a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp@@ -104,6 +104,8 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsysteexit(1);}+ strict_context_required = strcmp(SDL_GetCurrentVideoDriver(), "wayland") == 0;+SetWindowIcon();if (fullscreen) {