From 842fb2f94d1175445220cf776c90de737bdc314f Mon Sep 17 00:00:00 2001 From: The Dax Date: Mon, 24 Mar 2014 19:31:33 -0400 Subject: [PATCH 1/2] Win32: when an invalid OpenGL driver is detected, don't offer a choice of quitting or not, just quit. --- Windows/OpenGLBase.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Windows/OpenGLBase.cpp b/Windows/OpenGLBase.cpp index f400505e48..20d4d8ffea 100644 --- a/Windows/OpenGLBase.cpp +++ b/Windows/OpenGLBase.cpp @@ -159,16 +159,15 @@ bool GL_Init(HWND window, std::string *error_message) { const char *defaultError = "Insufficient OpenGL driver support detected!\n\n" "Your GPU reports that it does not support OpenGL 2.0, which is currently required for PPSSPP to run.\n\n" "Please check that your GPU is compatible with OpenGL 2.0.If it is, you need to find and install new graphics drivers from your GPU vendor's website.\n\n" - "Visit the forums at http://forums.ppsspp.org for more information.\n\n" - "Exit now?"; + "Visit the forums at http://forums.ppsspp.org for more information.\n\n"; std::wstring error = ConvertUTF8ToWString(err->T("InsufficientOpenGLDriver", defaultError)); std::wstring title = ConvertUTF8ToWString(err->T("OpenGLDriverError", "OpenGL driver error")); - if (MessageBox(hWnd, error.c_str(), title.c_str(), MB_ICONERROR | MB_YESNO) == IDYES) { - // Avoid further error messages. Let's just bail, it's safe. - ExitProcess(0); - } + MessageBox(hWnd, error.c_str(), title.c_str(), MB_ICONERROR); + + // Avoid further error messages. Let's just bail, it's safe, and we can't continue. + ExitProcess(0); } if (GLEW_OK != glewInit()) { From c5036511b034fe0a1f21468dbbef5a2b7cf8295c Mon Sep 17 00:00:00 2001 From: The Dax Date: Mon, 24 Mar 2014 19:43:52 -0400 Subject: [PATCH 2/2] Include the renderer string too, for possibly extra helpful info. --- Windows/OpenGLBase.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Windows/OpenGLBase.cpp b/Windows/OpenGLBase.cpp index 20d4d8ffea..0a7207369e 100644 --- a/Windows/OpenGLBase.cpp +++ b/Windows/OpenGLBase.cpp @@ -161,10 +161,12 @@ bool GL_Init(HWND window, std::string *error_message) { "Please check that your GPU is compatible with OpenGL 2.0.If it is, you need to find and install new graphics drivers from your GPU vendor's website.\n\n" "Visit the forums at http://forums.ppsspp.org for more information.\n\n"; + std::wstring versionDetected = ConvertUTF8ToWString(glVersion + "\n\n"); std::wstring error = ConvertUTF8ToWString(err->T("InsufficientOpenGLDriver", defaultError)); std::wstring title = ConvertUTF8ToWString(err->T("OpenGLDriverError", "OpenGL driver error")); + std::wstring combined = versionDetected + error; - MessageBox(hWnd, error.c_str(), title.c_str(), MB_ICONERROR); + MessageBox(hWnd, combined.c_str(), title.c_str(), MB_ICONERROR); // Avoid further error messages. Let's just bail, it's safe, and we can't continue. ExitProcess(0);