Preprocessor: #if's out OSX-specific GL changes on other platforms
This commit is contained in:
parent
06ef8f001a
commit
ee4717aaae
3 changed files with 9 additions and 1 deletions
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue