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 ad843b7def6bb2f1683b8c387eef3b7633b1fcc8..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
@@ -412,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)
 {