notsoyuzu
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1220 from FearlessTobi/extensions-qol 

yuzu: Display the unsupported GL extensions in the popup
This commit is contained in:
bunnei 2018-09-02 10:47:25 -04:00 committed by GitHub
parent 177c45e97d 0f453488e2
commit d2ade27c3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/yuzu/main.cpp
View File

@ -419,7 +419,7 @@ void GMainWindow::OnDisplayTitleBars(bool show) {
} }
} }
bool GMainWindow::SupportsRequiredGLExtensions() { QStringList GMainWindow::GetUnsupportedGLExtensions() {
QStringList unsupported_ext; QStringList unsupported_ext;
if (!GLAD_GL_ARB_program_interface_query) if (!GLAD_GL_ARB_program_interface_query)
@ -446,7 +446,7 @@ bool GMainWindow::SupportsRequiredGLExtensions() {
for (const QString& ext : unsupported_ext) for (const QString& ext : unsupported_ext)
LOG_CRITICAL(Frontend, "Unsupported GL extension: {}", ext.toStdString()); LOG_CRITICAL(Frontend, "Unsupported GL extension: {}", ext.toStdString());
return unsupported_ext.empty(); return unsupported_ext;
} }
bool GMainWindow::LoadROM(const QString& filename) { bool GMainWindow::LoadROM(const QString& filename) {
@ -464,11 +464,13 @@ bool GMainWindow::LoadROM(const QString& filename) {
return false; return false;
} }
if (!SupportsRequiredGLExtensions()) { QStringList unsupported_gl_extensions = GetUnsupportedGLExtensions();
QMessageBox::critical( if (!unsupported_gl_extensions.empty()) {
this, tr("Error while initializing OpenGL Core!"), QMessageBox::critical(this, tr("Error while initializing OpenGL Core!"),
tr("Your GPU may not support one or more required OpenGL extensions. Please " tr("Your GPU may not support one or more required OpenGL"
"ensure you have the latest graphics driver. See the log for more details.")); "extensions. Please ensure you have the latest graphics "
"driver.<br><br>Unsupported extensions:<br>") +
unsupported_gl_extensions.join("<br>"));
return false; return false;
} }

2
src/yuzu/main.h
View File

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