summaryrefslogtreecommitdiff
path: root/src/citra
diff options
context:
space:
mode:
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/emu_window/emu_window_glfw.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index e6943f146..ea1499e7c 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -27,11 +27,18 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
27 exit(1); 27 exit(1);
28 } 28 }
29 glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); 29 glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
30 glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1); 30 glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
31 glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
32 glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
31 m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth, 33 m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth,
32 (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), 34 (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight),
33 m_window_title.c_str(), NULL, NULL); 35 m_window_title.c_str(), NULL, NULL);
34 36
37 if (m_render_window == NULL) {
38 printf("Failed to create GLFW window! Exiting...");
39 exit(1);
40 }
41
35 // Setup callbacks 42 // Setup callbacks
36 glfwSetWindowUserPointer(m_render_window, this); 43 glfwSetWindowUserPointer(m_render_window, this);
37 //glfwSetKeyCallback(m_render_window, OnKeyEvent); 44 //glfwSetKeyCallback(m_render_window, OnKeyEvent);