diff options
| author | 2014-08-13 13:10:45 -0400 | |
|---|---|---|
| committer | 2014-08-13 13:10:45 -0400 | |
| commit | 388356f629831a7095dc7d2e31820a638e66ab76 (patch) | |
| tree | 307e83cc2934535ae28fdbb0f4849ed23025700a /src | |
| parent | Merge pull request #44 from archshift/clang-build (diff) | |
| parent | Use glewExperimental on Linux in order to fix GLFW-mode (diff) | |
| download | yuzu-388356f629831a7095dc7d2e31820a638e66ab76.tar.gz yuzu-388356f629831a7095dc7d2e31820a638e66ab76.tar.xz yuzu-388356f629831a7095dc7d2e31820a638e66ab76.zip | |
Merge pull request #42 from archshift/glexp
Use glewExperimental to fix crashes with citra-glfw
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/video_core.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index 3b8039de4..087b08026 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp | |||
| @@ -31,10 +31,9 @@ void Start() { | |||
| 31 | /// Initialize the video core | 31 | /// Initialize the video core |
| 32 | void Init(EmuWindow* emu_window) { | 32 | void Init(EmuWindow* emu_window) { |
| 33 | 33 | ||
| 34 | #if EMU_PLATFORM == PLATFORM_MACOSX | 34 | // Required in order for GLFW to work on Linux, |
| 35 | // Known problem with GLEW prevents contexts above 2.x on OSX unless glewExperimental is enabled. | 35 | // or for GL contexts above 2.x on OS X |
| 36 | glewExperimental = GL_TRUE; | 36 | glewExperimental = GL_TRUE; |
| 37 | #endif | ||
| 38 | 37 | ||
| 39 | g_emu_window = emu_window; | 38 | g_emu_window = emu_window; |
| 40 | g_emu_window->MakeCurrent(); | 39 | g_emu_window->MakeCurrent(); |