summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Emmanuel Gil Peyrot2014-11-28 23:35:57 +0000
committerGravatar Emmanuel Gil Peyrot2014-11-29 23:03:04 +0000
commit648743cf66f99a0941929788b8c371643b217d35 (patch)
tree0d7e3100ad775186adf32bbd295162f67ee18093
parentMerge pull request #227 from vaguilar/fix-warnings (diff)
downloadyuzu-648743cf66f99a0941929788b8c371643b217d35.tar.gz
yuzu-648743cf66f99a0941929788b8c371643b217d35.tar.xz
yuzu-648743cf66f99a0941929788b8c371643b217d35.zip
GLFW: Add an error callback before calling glfwInit()
It will print a message to know what happened in case something went wrong in a GLFW call. Also replace every printf() in the glfw emu-window by ERROR_LOG().
-rw-r--r--src/citra/emu_window/emu_window_glfw.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index 8efb39e2e..697bf4693 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -58,9 +58,13 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
58 58
59 ReloadSetKeymaps(); 59 ReloadSetKeymaps();
60 60
61 glfwSetErrorCallback([](int error, const char *desc){
62 ERROR_LOG(GUI, "GLFW 0x%08x: %s", error, desc);
63 });
64
61 // Initialize the window 65 // Initialize the window
62 if(glfwInit() != GL_TRUE) { 66 if(glfwInit() != GL_TRUE) {
63 printf("Failed to initialize GLFW! Exiting..."); 67 ERROR_LOG(GUI, "Failed to initialize GLFW! Exiting...");
64 exit(1); 68 exit(1);
65 } 69 }
66 glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); 70 glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
@@ -75,7 +79,7 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
75 window_title.c_str(), NULL, NULL); 79 window_title.c_str(), NULL, NULL);
76 80
77 if (m_render_window == NULL) { 81 if (m_render_window == NULL) {
78 printf("Failed to create GLFW window! Exiting..."); 82 ERROR_LOG(GUI, "Failed to create GLFW window! Exiting...");
79 exit(1); 83 exit(1);
80 } 84 }
81 85