Przeglądaj źródła

Merge pull request #490 from BreadFish64/extension-check

Add checks for OpenGL extension support
bunnei 8 lat temu
rodzic
commit
0a0233f39f

+ 26 - 0
src/yuzu/main.cpp

@@ -335,6 +335,24 @@ void GMainWindow::OnDisplayTitleBars(bool show) {
     }
     }
 }
 }
 
 
+bool GMainWindow::SupportsRequiredGLExtensions() {
+    QStringList unsupported_ext;
+
+    if (!GLAD_GL_ARB_program_interface_query)
+        unsupported_ext.append("ARB_program_interface_query");
+    if (!GLAD_GL_ARB_separate_shader_objects)
+        unsupported_ext.append("ARB_separate_shader_objects");
+    if (!GLAD_GL_ARB_shader_storage_buffer_object)
+        unsupported_ext.append("ARB_shader_storage_buffer_object");
+    if (!GLAD_GL_ARB_vertex_attrib_binding)
+        unsupported_ext.append("ARB_vertex_attrib_binding");
+
+    for (const QString& ext : unsupported_ext)
+        NGLOG_CRITICAL(Frontend, "Unsupported GL extension: {}", ext.toStdString());
+
+    return unsupported_ext.empty();
+}
+
 bool GMainWindow::LoadROM(const QString& filename) {
 bool GMainWindow::LoadROM(const QString& filename) {
     // Shutdown previous session if the emu thread is still active...
     // Shutdown previous session if the emu thread is still active...
     if (emu_thread != nullptr)
     if (emu_thread != nullptr)
@@ -350,6 +368,14 @@ bool GMainWindow::LoadROM(const QString& filename) {
         return false;
         return false;
     }
     }
 
 
+    if (!SupportsRequiredGLExtensions()) {
+        QMessageBox::critical(
+            this, tr("Error while initializing OpenGL Core!"),
+            tr("Your GPU may not support one or more required OpenGL extensions. Please "
+               "ensure you have the latest graphics driver. See the log for more details."));
+        return false;
+    }
+
     Core::System& system{Core::System::GetInstance()};
     Core::System& system{Core::System::GetInstance()};
 
 
     system.SetGPUDebugContext(debug_context);
     system.SetGPUDebugContext(debug_context);

+ 1 - 0
src/yuzu/main.h

@@ -79,6 +79,7 @@ private:
     void ConnectWidgetEvents();
     void ConnectWidgetEvents();
     void ConnectMenuEvents();
     void ConnectMenuEvents();
 
 
+    bool SupportsRequiredGLExtensions();
     bool LoadROM(const QString& filename);
     bool LoadROM(const QString& filename);
     void BootGame(const QString& filename);
     void BootGame(const QString& filename);
     void ShutdownGame();
     void ShutdownGame();

+ 23 - 0
src/yuzu_cmd/emu_window/emu_window_sdl2.cpp

@@ -78,6 +78,24 @@ void EmuWindow_SDL2::Fullscreen() {
     SDL_MaximizeWindow(render_window);
     SDL_MaximizeWindow(render_window);
 }
 }
 
 
+bool EmuWindow_SDL2::SupportsRequiredGLExtensions() {
+    std::vector<std::string> unsupported_ext;
+
+    if (!GLAD_GL_ARB_program_interface_query)
+        unsupported_ext.push_back("ARB_program_interface_query");
+    if (!GLAD_GL_ARB_separate_shader_objects)
+        unsupported_ext.push_back("ARB_separate_shader_objects");
+    if (!GLAD_GL_ARB_shader_storage_buffer_object)
+        unsupported_ext.push_back("ARB_shader_storage_buffer_object");
+    if (!GLAD_GL_ARB_vertex_attrib_binding)
+        unsupported_ext.push_back("ARB_vertex_attrib_binding");
+
+    for (const std::string& ext : unsupported_ext)
+        NGLOG_CRITICAL(Frontend, "Unsupported GL extension: {}", ext);
+
+    return unsupported_ext.empty();
+}
+
 EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) {
 EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) {
     InputCommon::Init();
     InputCommon::Init();
 
 
@@ -128,6 +146,11 @@ EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) {
         exit(1);
         exit(1);
     }
     }
 
 
+    if (!SupportsRequiredGLExtensions()) {
+        NGLOG_CRITICAL(Frontend, "GPU does not support all required OpenGL extensions! Exiting...");
+        exit(1);
+    }
+
     OnResize();
     OnResize();
     OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
     OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
     SDL_PumpEvents();
     SDL_PumpEvents();

+ 3 - 0
src/yuzu_cmd/emu_window/emu_window_sdl2.h

@@ -46,6 +46,9 @@ private:
     /// Called when user passes the fullscreen parameter flag
     /// Called when user passes the fullscreen parameter flag
     void Fullscreen();
     void Fullscreen();
 
 
+    /// Whether the GPU and driver supports the OpenGL extension required
+    bool SupportsRequiredGLExtensions();
+
     /// Called when a configuration change affects the minimal size of the window
     /// Called when a configuration change affects the minimal size of the window
     void OnMinimalClientAreaChangeRequest(
     void OnMinimalClientAreaChangeRequest(
         const std::pair<unsigned, unsigned>& minimal_size) override;
         const std::pair<unsigned, unsigned>& minimal_size) override;