diff options
| author |  archshift <admin@archshift.com> | 2014-06-09 16:51:09 -0700 |
|---|---|---|
| committer |  bunnei <ericbunnie@gmail.com> | 2014-06-12 06:10:55 -0400 |
| commit | ee4717aaaed6302aacd6d378bf0c75b811957c40 (patch) | |
| tree | a103ab1c58e1d19ce0d0e28516cb8bcad63b8da1 /src/citra/emu_window | |
| parent | 06ef8f001a904c9c6e300a488503fa76177ebe10 (diff) | |
Preprocessor: #if's out OSX-specific GL changes on other platforms
Diffstat (limited to 'src/citra/emu_window')
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 5 |
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 73c11637..f882a825 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); |