summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-06-10 01:51:09 +0200
committerbunnei <ericbunnie@gmail.com>2014-06-12 12:10:55 +0200
commitee4717aaaed6302aacd6d378bf0c75b811957c40 (patch)
treea103ab1c58e1d19ce0d0e28516cb8bcad63b8da1 /src/citra
parentCommon: Removed duplicate "LONG" and "MAX_PATH" definitions. (diff)
downloadyuzu-ee4717aaaed6302aacd6d378bf0c75b811957c40.tar
yuzu-ee4717aaaed6302aacd6d378bf0c75b811957c40.tar.gz
yuzu-ee4717aaaed6302aacd6d378bf0c75b811957c40.tar.bz2
yuzu-ee4717aaaed6302aacd6d378bf0c75b811957c40.tar.lz
yuzu-ee4717aaaed6302aacd6d378bf0c75b811957c40.tar.xz
yuzu-ee4717aaaed6302aacd6d378bf0c75b811957c40.tar.zst
yuzu-ee4717aaaed6302aacd6d378bf0c75b811957c40.zip
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/emu_window/emu_window_glfw.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index 73c116373..f882a825e 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -28,8 +28,13 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
}
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
+
+#if EMU_PLATFORM == PLATFORM_MACOSX
+ // GLFW on OSX requires these window hints to be set to create a 3.2+ GL context.
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+#endif
+
m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth,
(VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight),
m_window_title.c_str(), NULL, NULL);