xserver: Branch 'master'

[Adam Jackson]

 glamor/glamor.c |    9 +++++++++
 glamor/glamor.h |    1 +
 2 files changed, 10 insertions(+)

New commits:
commit aa4e757130010dd3202f10ec6cb0c306c1dbcfbc
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Mar 11 09:22:00 2016 +1000

    glamor: add glamor_finish API
    
    Some drivers are calling glFinish, they really should be doing this.
    
    This also is needed for some reverse prime scenarios.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/glamor/glamor.c b/glamor/glamor.c
index efe5953..477bc0e 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -813,3 +813,12 @@ glamor_name_from_pixmap(PixmapPtr pixmap, CARD16 *stride, CARD32 *size)
     }
     return -1;
 }
+
+void
+glamor_finish(ScreenPtr screen)
+{
+    glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
+
+    glamor_make_current(glamor_priv);
+    glFinish();
+}
diff --git a/glamor/glamor.h b/glamor/glamor.h
index a73e9ef..e27033a 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -336,6 +336,7 @@ extern _X_EXPORT void glamor_destroy_gc(GCPtr gc);
 extern Bool _X_EXPORT glamor_change_window_attributes(WindowPtr pWin, unsigned long mask);
 extern void _X_EXPORT glamor_copy_window(WindowPtr window, DDXPointRec old_origin, RegionPtr src_region);
 
+extern _X_EXPORT void glamor_finish(ScreenPtr screen);
 #define HAS_GLAMOR_TEXT 1
 
 #ifdef GLAMOR_FOR_XORG