Merge branch 'mesa_7_6_branch'

[mesa.git] / src / gallium / winsys / xlib / xlib_softpipe.c

diff --git a/src/gallium/winsys/xlib/xlib_softpipe.c b/src/gallium/winsys/xlib/xlib_softpipe.c
index 1de93c4e8c5141785511a2dafcc317a469cea1e4..260b39e2a0fb1dd93922baa8175590ff8b2a21bd 100644 (file)
--- a/src/gallium/winsys/xlib/xlib_softpipe.c
+++ b/src/gallium/winsys/xlib/xlib_softpipe.c
@@ -301,6 +301,7 @@ xm_flush_frontbuffer(struct pipe_winsys *pws,
     */
    XMesaContext xmctx = (XMesaContext) context_private;
    xlib_softpipe_display_surface(xmctx->xm_buffer, surf);
+   xmesa_check_and_update_buffer_size(xmctx, xmctx->xm_buffer);
 }
 
 
@@ -355,6 +356,7 @@ xm_surface_buffer_create(struct pipe_winsys *winsys,
                          unsigned width, unsigned height,
                          enum pipe_format format,
                          unsigned usage,
+                         unsigned tex_usage,
                          unsigned *stride)
 {
    const unsigned alignment = 64;