Squashed commit of the following:

[mesa.git] / src / gallium / winsys / sw / xlib / xlib_sw_winsys.c

diff --git a/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
index 54789d7a87c527e943f92129ec3dcd07d0f8cc62..ec4f919d08233508a6f9604f31b44991e4faacdd 100644 (file)
--- a/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
+++ b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
@@ -49,7 +49,7 @@
 #include <X11/extensions/XShm.h>
 
 /**
- * Subclass of pipe_buffer for Xlib winsys.
+ * Display target for Xlib winsys.
  * Low-level OS/window system memory buffer
  */
 struct xm_displaytarget
@@ -341,6 +341,8 @@ xlib_sw_display(struct xlib_drawable *xlib_drawable,
       XPutImage(xm_dt->display, xlib_drawable->drawable, xm_dt->gc,
                 ximage, 0, 0, 0, 0, xm_dt->width, xm_dt->height);
    }
+
+   XFlush(xm_dt->display);
 }
 
 /**
@@ -410,7 +412,7 @@ no_xm_dt:
 
 static struct sw_displaytarget *
 xm_displaytarget_from_handle(struct sw_winsys *winsys,
-                             const struct pipe_texture *templet,
+                             const struct pipe_resource *templet,
                              struct winsys_handle *whandle,
                              unsigned *stride)
 {