From 405215f862e919350dfb8fe168f667e695afa6af Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 13 Apr 2022 16:01:25 +0200 Subject: [PATCH] Revert "app: don't delay FrameEvent.Frame by v-sync latency" This reverts commit 38ff78df5dbeb8fcb13fa743a891237afd9ff573, because it broke OpenGL by moving eglSwapBuffers outside the MakeCurrent context scope. Fixes: https://todo.sr.ht/~eliasnaur/gio/393 Signed-off-by: Elias Naur --- app/window.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/window.go b/app/window.go index 28de519b..f71375f0 100644 --- a/app/window.go +++ b/app/window.go @@ -248,7 +248,10 @@ func (w *Window) render(frame *op.Ops, viewport image.Point) error { if err != nil { return err } - return w.gpu.Frame(frame, target, viewport) + if err := w.gpu.Frame(frame, target, viewport); err != nil { + return err + } + return w.ctx.Present() } func (w *Window) processFrame(d driver, frameStart time.Time) { @@ -805,9 +808,6 @@ func (w *Window) processEvent(d driver, e event.Event) { // We're done with frame, let the client continue. w.frameAck <- struct{}{} } - if err == nil && w.gpu != nil { - err = w.ctx.Present() - } if err != nil { w.destroyGPU() w.out <- system.DestroyEvent{Err: err}