summaryrefslogtreecommitdiffstats
path: root/src
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
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')
-rw-r--r--src/citra/emu_window/emu_window_glfw.cpp5
-rw-r--r--src/common/platform.h2
-rw-r--r--src/video_core/video_core.cpp3
3 files changed, 9 insertions, 1 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);
diff --git a/src/common/platform.h b/src/common/platform.h
index 944bb0303..b02b52cd2 100644
--- a/src/common/platform.h
+++ b/src/common/platform.h
@@ -47,7 +47,7 @@
#define EMU_PLATFORM PLATFORM_WINDOWS
#elif defined( __APPLE__ ) || defined( __APPLE_CC__ )
-#define EMU_PLATFORM PLATFORM_MAXOSX
+#define EMU_PLATFORM PLATFORM_MACOSX
#elif defined(__linux__)
#define EMU_PLATFORM PLATFORM_LINUX
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index cbd540bdf..3b8039de4 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -30,8 +30,11 @@ void Start() {
/// Initialize the video core
void Init(EmuWindow* emu_window) {
+
+#if EMU_PLATFORM == PLATFORM_MACOSX
// Known problem with GLEW prevents contexts above 2.x on OSX unless glewExperimental is enabled.
glewExperimental = GL_TRUE;
+#endif
g_emu_window = emu_window;
g_emu_window->MakeCurrent();