Răsfoiți Sursa

Preprocessor: #if's out OSX-specific GL changes on other platforms

archshift 12 ani în urmă
părinte
comite
ee4717aaae

+ 5 - 0
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_MAJOR, 3);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
     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_FORWARD_COMPAT, GL_TRUE);
     glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
     glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+#endif
+	
     m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth, 
     m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth, 
         (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), 
         (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), 
         m_window_title.c_str(), NULL, NULL);
         m_window_title.c_str(), NULL, NULL);

+ 1 - 1
src/common/platform.h

@@ -47,7 +47,7 @@
 #define EMU_PLATFORM PLATFORM_WINDOWS
 #define EMU_PLATFORM PLATFORM_WINDOWS
 
 
 #elif defined( __APPLE__ ) || defined( __APPLE_CC__ )
 #elif defined( __APPLE__ ) || defined( __APPLE_CC__ )
-#define EMU_PLATFORM PLATFORM_MAXOSX
+#define EMU_PLATFORM PLATFORM_MACOSX
 
 
 #elif defined(__linux__)
 #elif defined(__linux__)
 #define EMU_PLATFORM PLATFORM_LINUX
 #define EMU_PLATFORM PLATFORM_LINUX

+ 3 - 0
src/video_core/video_core.cpp

@@ -30,8 +30,11 @@ void Start() {
 
 
 /// Initialize the video core
 /// Initialize the video core
 void Init(EmuWindow* emu_window) {
 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.
     // Known problem with GLEW prevents contexts above 2.x on OSX unless glewExperimental is enabled.
     glewExperimental = GL_TRUE;
     glewExperimental = GL_TRUE;
+#endif
 
 
     g_emu_window = emu_window;
     g_emu_window = emu_window;
     g_emu_window->MakeCurrent();
     g_emu_window->MakeCurrent();