midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #228 from linkmauve/glfw-error

Browse Source 
GLFW: Add an error callback before calling glfwInit()
This commit is contained in:
bunnei 2014-11-30 08:41:17 -05:00
commit 2ad9ad9297
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/citra/emu_window/emu_window_glfw.cpp
View File

@ -58,9 +58,13 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
ReloadSetKeymaps(); ReloadSetKeymaps();
glfwSetErrorCallback([](int error, const char *desc){
ERROR_LOG(GUI, "GLFW 0x%08x: %s", error, desc);
});
// Initialize the window // Initialize the window
if(glfwInit() != GL_TRUE) { if(glfwInit() != GL_TRUE) {
printf("Failed to initialize GLFW! Exiting..."); ERROR_LOG(GUI, "Failed to initialize GLFW! Exiting...");
exit(1); exit(1);
} }
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
@ -75,7 +79,7 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
window_title.c_str(), NULL, NULL); window_title.c_str(), NULL, NULL);
if (m_render_window == NULL) { if (m_render_window == NULL) {
printf("Failed to create GLFW window! Exiting..."); ERROR_LOG(GUI, "Failed to create GLFW window! Exiting...");
exit(1); exit(1);
} }