diff options
author | bunnei <bunneidev@gmail.com> | 2018-09-02 16:47:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-02 16:47:25 +0200 |
commit | d2ade27c3f2dc1724a397d5888c58f8a26b1bc60 (patch) | |
tree | b498aa7d9afc6dfde6c320b3013e93cf5bbcf626 | |
parent | Merge pull request #1214 from ogniK5377/ipa-assert (diff) | |
parent | citra_qt: Display the unsupported GL extensions in the popup (diff) | |
download | yuzu-d2ade27c3f2dc1724a397d5888c58f8a26b1bc60.tar yuzu-d2ade27c3f2dc1724a397d5888c58f8a26b1bc60.tar.gz yuzu-d2ade27c3f2dc1724a397d5888c58f8a26b1bc60.tar.bz2 yuzu-d2ade27c3f2dc1724a397d5888c58f8a26b1bc60.tar.lz yuzu-d2ade27c3f2dc1724a397d5888c58f8a26b1bc60.tar.xz yuzu-d2ade27c3f2dc1724a397d5888c58f8a26b1bc60.tar.zst yuzu-d2ade27c3f2dc1724a397d5888c58f8a26b1bc60.zip |
-rw-r--r-- | src/yuzu/main.cpp | 16 | ||||
-rw-r--r-- | src/yuzu/main.h | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index e11ba7854..cfc48a416 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -419,7 +419,7 @@ void GMainWindow::OnDisplayTitleBars(bool show) { } } -bool GMainWindow::SupportsRequiredGLExtensions() { +QStringList GMainWindow::GetUnsupportedGLExtensions() { QStringList unsupported_ext; if (!GLAD_GL_ARB_program_interface_query) @@ -446,7 +446,7 @@ bool GMainWindow::SupportsRequiredGLExtensions() { for (const QString& ext : unsupported_ext) LOG_CRITICAL(Frontend, "Unsupported GL extension: {}", ext.toStdString()); - return unsupported_ext.empty(); + return unsupported_ext; } bool GMainWindow::LoadROM(const QString& filename) { @@ -464,11 +464,13 @@ bool GMainWindow::LoadROM(const QString& filename) { 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.")); + QStringList unsupported_gl_extensions = GetUnsupportedGLExtensions(); + if (!unsupported_gl_extensions.empty()) { + 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.<br><br>Unsupported extensions:<br>") + + unsupported_gl_extensions.join("<br>")); return false; } diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 0b97e8220..3d6ebe329 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -85,7 +85,7 @@ private: void ConnectWidgetEvents(); void ConnectMenuEvents(); - bool SupportsRequiredGLExtensions(); + QStringList GetUnsupportedGLExtensions(); bool LoadROM(const QString& filename); void BootGame(const QString& filename); void ShutdownGame(); |