Browse Source
Merge pull request #3277 from ReinUsesLisp/make-current
yuzu/bootmanager: Remove {glx,wgl}MakeCurrent on SwapBuffers
pull/15/merge
bunnei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
9 deletions
-
src/yuzu/bootmanager.cpp
|
|
@ -215,18 +215,11 @@ void GRenderWindow::moveContext() { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void GRenderWindow::SwapBuffers() { |
|
|
void GRenderWindow::SwapBuffers() { |
|
|
// In our multi-threaded QWidget use case we shouldn't need to call `makeCurrent`,
|
|
|
|
|
|
// since we never call `doneCurrent` in this thread.
|
|
|
|
|
|
// However:
|
|
|
|
|
|
// - The Qt debug runtime prints a bogus warning on the console if `makeCurrent` wasn't called
|
|
|
|
|
|
// since the last time `swapBuffers` was executed;
|
|
|
|
|
|
// - On macOS, if `makeCurrent` isn't called explicitly, resizing the buffer breaks.
|
|
|
|
|
|
context->makeCurrent(child); |
|
|
|
|
|
|
|
|
|
|
|
context->swapBuffers(child); |
|
|
context->swapBuffers(child); |
|
|
|
|
|
|
|
|
if (!first_frame) { |
|
|
if (!first_frame) { |
|
|
emit FirstFrameDisplayed(); |
|
|
|
|
|
first_frame = true; |
|
|
first_frame = true; |
|
|
|
|
|
emit FirstFrameDisplayed(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|