diff options
author | bunnei <bunneidev@gmail.com> | 2018-07-14 20:18:11 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-14 20:18:11 -0700 |
commit | 2cb3fdca86192d5dd2f3c988b5d57732c0bee6dc (patch) | |
tree | 8004356e5a9cbbeb4e37dcad9d47ddfffc5f3210 /src/yuzu/main.cpp | |
parent | c324a378ac5ddc106cab9856a9f90a7f8fa573f1 (diff) | |
parent | 05cb10530fbd34635b06f75dea488a8896a763ac (diff) |
Merge pull request #598 from bunnei/makedonecurrent
OpenGL: Use MakeCurrent/DoneCurrent for multithreaded rendering.
Diffstat (limited to 'src/yuzu/main.cpp')
-rw-r--r-- | src/yuzu/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 9ce8d7c27..16812e077 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -374,6 +374,8 @@ bool GMainWindow::LoadROM(const QString& filename) { const Core::System::ResultStatus result{system.Load(render_window, filename.toStdString())}; + render_window->DoneCurrent(); + if (result != Core::System::ResultStatus::Success) { switch (result) { case Core::System::ResultStatus::ErrorGetLoader: @@ -916,6 +918,7 @@ int main(int argc, char* argv[]) { QCoreApplication::setApplicationName("yuzu"); QApplication::setAttribute(Qt::AA_X11InitThreads); + QApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity); QApplication app(argc, argv); // Qt changes the locale and causes issues in float conversion using std::to_string() when |