diff options
| author |  bunnei | 2014-08-24 22:25:35 -0400 |
|---|---|---|
| committer | bunnei | 2014-08-24 22:25:35 -0400 |
| commit | 613b0a8df85578c97790c5b116195e8bd2fad6f4 (patch) | |
| tree | 64505f9f1dbe1d10b8b15661db8f2dc191d8ca98 /src/video_core | |
| parent | Merge pull request #73 from yuriks/remove-docs (diff) | |
| parent | Pass format to the QGLWidget and use atomic instead of mutex. (diff) | |
| download | yuzu-613b0a8df85578c97790c5b116195e8bd2fad6f4.tar.gz yuzu-613b0a8df85578c97790c5b116195e8bd2fad6f4.tar.xz yuzu-613b0a8df85578c97790c5b116195e8bd2fad6f4.zip | |
Merge pull request #75 from xsacha/qt5
Fix threading for Qt5.
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/video_core.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index 087b08026..a1c7b6339 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp | |||
| @@ -36,7 +36,6 @@ void Init(EmuWindow* emu_window) { | |||
| 36 | glewExperimental = GL_TRUE; | 36 | glewExperimental = GL_TRUE; |
| 37 | 37 | ||
| 38 | g_emu_window = emu_window; | 38 | g_emu_window = emu_window; |
| 39 | g_emu_window->MakeCurrent(); | ||
| 40 | g_renderer = new RendererOpenGL(); | 39 | g_renderer = new RendererOpenGL(); |
| 41 | g_renderer->SetWindow(g_emu_window); | 40 | g_renderer->SetWindow(g_emu_window); |
| 42 | g_renderer->Init(); | 41 | g_renderer->Init(); |