From 88823f66cb7f053e1d0f22d2eb0510ab32d8e474 Mon Sep 17 00:00:00 2001 From: Arisotura Date: Fri, 29 May 2020 22:18:21 +0200 Subject: [PATCH] * fix the OpenGL shito under Linux * make the 'BIOS not found' errors a bit more user-friendly --- src/OpenGLSupport.h | 14 +++++++++++++- src/frontend/qt_sdl/main.cpp | 6 +++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/OpenGLSupport.h b/src/OpenGLSupport.h index edf7edad..925c0ad0 100644 --- a/src/OpenGLSupport.h +++ b/src/OpenGLSupport.h @@ -49,9 +49,21 @@ // if you need more OpenGL functions, add them to the macronator here -#define DO_PROCLIST(func) \ +#ifdef __WIN32__ + +#define DO_PROCLIST_1_3(func) \ func(GLACTIVETEXTURE, glActiveTexture); \ func(GLBLENDCOLOR, glBlendColor); \ + +#else + +#define DO_PROCLIST_1_3(func) + +#endif + + +#define DO_PROCLIST(func) \ + DO_PROCLIST_1_3(func) \ \ func(GLGENFRAMEBUFFERS, glGenFramebuffers); \ func(GLDELETEFRAMEBUFFERS, glDeleteFramebuffers); \ diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp index 68a32c8d..8df6ec87 100644 --- a/src/frontend/qt_sdl/main.cpp +++ b/src/frontend/qt_sdl/main.cpp @@ -1360,13 +1360,13 @@ QString MainWindow::loadErrorStr(int error) { switch (error) { - case Frontend::Load_BIOS9Missing: return "DS ARM9 BIOS was not found or could not be accessed."; + case Frontend::Load_BIOS9Missing: return "DS ARM9 BIOS was not found or could not be accessed. Check your emu settings."; case Frontend::Load_BIOS9Bad: return "DS ARM9 BIOS is not a valid BIOS dump."; - case Frontend::Load_BIOS7Missing: return "DS ARM7 BIOS was not found or could not be accessed."; + case Frontend::Load_BIOS7Missing: return "DS ARM7 BIOS was not found or could not be accessed. Check your emu settings."; case Frontend::Load_BIOS7Bad: return "DS ARM7 BIOS is not a valid BIOS dump."; - case Frontend::Load_FirmwareMissing: return "DS firmware was not found or could not be accessed."; + case Frontend::Load_FirmwareMissing: return "DS firmware was not found or could not be accessed. Check your emu settings."; case Frontend::Load_FirmwareBad: return "DS firmware is not a valid firmware dump."; case Frontend::Load_FirmwareNotBootable: return "DS firmware is not bootable.";