From ece2cc3352f52858587d13092b4300b0d6447760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis-Francis=20Ratt=C3=A9-Boulianne?= <lfrb@collabora.com>
Date: Wed, 27 May 2020 01:50:20 -0400
Subject: [PATCH] wgl: Wait for fence when not using winsys framebuffer

Reviewed-by: Charmaine Lee <charmainel@vmware.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7535>
---
 src/gallium/frontends/wgl/stw_st.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/frontends/wgl/stw_st.c b/src/gallium/frontends/wgl/stw_st.c
index 5a6990139f6..6dabb2ae2d8 100644
--- a/src/gallium/frontends/wgl/stw_st.c
+++ b/src/gallium/frontends/wgl/stw_st.c
@@ -286,6 +286,9 @@ stw_st_flush(struct st_context_iface *stctx,
    args.stwfb = stwfb;
    args.flags = flags;
 
+   if (flags & ST_FLUSH_END_OF_FRAME && !stwfb->fb->winsys_framebuffer)
+      flags |= ST_FLUSH_WAIT;
+
    if (flags & ST_FLUSH_WAIT)
       pfence = &fence;
    stctx->flush(stctx, flags, pfence, notify_before_flush_cb, &args);