aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/citra/emu_window/emu_window_glfw.cpp
diff options
context:
space:
mode:
authorGravatar bunnei <ericbunnie@gmail.com>2014-05-22 22:54:56 -0400
committerGravatar bunnei <ericbunnie@gmail.com>2014-05-22 22:54:56 -0400
commit1de7e8cbe4ee9aab3bc920721a90ef63537771b8 (patch)
tree4aae70232dc6d148af003a4d9f1c4f76aff5467b /src/citra/emu_window/emu_window_glfw.cpp
parent9592d61037d05dc53b454644671a441788996208 (diff)
parent204c6bfeca2d3bccfe6602699c0b3420f88aaf07 (diff)
Merge branch 'master' of https://github.com/bunnei/citra
Diffstat (limited to 'src/citra/emu_window/emu_window_glfw.cpp')
-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 e6943f14..73c11637 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() {
exit(1);
}
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
- glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
+ glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
+ glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
+ glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth,
(VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight),
m_window_title.c_str(), NULL, NULL);
+ if (m_render_window == NULL) {
+ printf("Failed to create GLFW window! Exiting...");
+ exit(1);
+ }
+
// Setup callbacks
glfwSetWindowUserPointer(m_render_window, this);
//glfwSetKeyCallback(m_render_window, OnKeyEvent);