aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei <bunneidev@gmail.com>2014-08-13 13:10:45 -0400
committerGravatar bunnei <bunneidev@gmail.com>2014-08-13 13:10:45 -0400
commit388356f629831a7095dc7d2e31820a638e66ab76 (patch)
tree307e83cc2934535ae28fdbb0f4849ed23025700a /src
parentad04e0be97cf69bcc1105019adea60edd3460bef (diff)
parentd71af1bd20534e928baf3f48298bad1a28356be7 (diff)
Merge pull request #42 from archshift/glexp
Use glewExperimental to fix crashes with citra-glfw
Diffstat (limited to 'src')
-rw-r--r--src/video_core/video_core.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index 3b8039de..087b0802 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -31,10 +31,9 @@ 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.
+ // Required in order for GLFW to work on Linux,
+ // or for GL contexts above 2.x on OS X
glewExperimental = GL_TRUE;
-#endif
g_emu_window = emu_window;
g_emu_window->MakeCurrent();