xserver: Branch 'master'

[Keith Packard]

 glamor/glamor_sync.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cff12936275db2f71f6d24f9ea0985a0d14af454
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Jul 18 21:46:23 2014 -0700

    glamor: sync_fence_set_triggered should use glFlush, not glFinish
    
    I intended to use glFlush all along, but somehow managed to type
    glFinish instead. glFlush is sufficient (for a single-queue GPU) to
    ensure serialization between queued rendering in the X server and
    future rendering from the client.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Jasper St. Pierre <jstpierre at mecheye.net>

diff --git a/glamor/glamor_sync.c b/glamor/glamor_sync.c
index d3d64a9..5e158c3 100644
--- a/glamor/glamor_sync.c
+++ b/glamor/glamor_sync.c
@@ -53,7 +53,7 @@ glamor_sync_fence_set_triggered (SyncFence *fence)
 
 	/* Flush pending rendering operations */
         glamor_make_current(glamor);
-        glFinish();
+        glFlush();
 
 	fence->funcs.SetTriggered = glamor_fence->set_triggered;
 	fence->funcs.SetTriggered(fence);