Mesa (master): st/vdpau: resolve delayed rendering for GL interop v2

[Christian König]

Module: Mesa
Branch: master
Commit: 5580ff818e0559099ffc79af60872908e9d5d747
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5580ff818e0559099ffc79af60872908e9d5d747

Author: Grigori Goronzy <greg at chown.ath.cx>
Date:   Wed Nov  6 00:35:31 2013 +0100

st/vdpau: resolve delayed rendering for GL interop v2

Otherwise OutputSurface interop has funny results sometimes.
This fixes interop with the mpv media player.

v2 (chk): add proper locking

Signed-off-by: Christian König <christian.koenig at amd.com>

---

 src/gallium/state_trackers/vdpau/output.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/gallium/state_trackers/vdpau/output.c b/src/gallium/state_trackers/vdpau/output.c
index def01c8..e4e1433 100644
--- a/src/gallium/state_trackers/vdpau/output.c
+++ b/src/gallium/state_trackers/vdpau/output.c
@@ -734,5 +734,9 @@ struct pipe_resource *vlVdpOutputSurfaceGallium(VdpOutputSurface surface)
    if (!vlsurface || !vlsurface->surface)
       return NULL;
 
+   pipe_mutex_lock(vlsurface->device->mutex);
+   vlVdpResolveDelayedRendering(vlsurface->device, NULL, NULL);
+   pipe_mutex_unlock(vlsurface->device->mutex);
+
    return vlsurface->surface->texture;
 }