3 files changed, 6 insertions, 7 deletions
diff --git a/src/gallium/winsys/sw/dri/SConscript b/src/gallium/winsys/sw/dri/SConscript
index b255d725f9..f8e1fa6cfd 100644
--- a/src/gallium/winsys/sw/dri/SConscript
+++ b/src/gallium/winsys/sw/dri/SConscript
@@ -4,7 +4,7 @@
 
 Import('*')
 
-if env['platform'] == 'linux':
+if env['platform'] in ('linux', 'sunos'):
 
     env = env.Clone()
 
diff --git a/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c b/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
index 8f9a90858d..51245766d1 100644
--- a/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
+++ b/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
@@ -61,10 +61,8 @@ struct wrapper_sw_displaytarget
    struct pipe_resource *tex;
    struct pipe_transfer *transfer;
 
-   unsigned width;
-   unsigned height;
    unsigned map_count;
-   unsigned stride; /**< because we give stride at create */
+   unsigned stride; /**< because we get stride at create */
    void *ptr;
 };
 
@@ -95,7 +93,7 @@ wsw_dt_get_stride(struct wrapper_sw_displaytarget *wdt, unsigned *stride)
 
    tr = pipe_get_transfer(pipe, tex, 0, 0,
                           PIPE_TRANSFER_READ_WRITE,
-                          0, 0, wdt->width, wdt->height);
+                          0, 0, wdt->tex->width0, wdt->tex->height0);
    if (!tr)
       return FALSE;
 
@@ -208,7 +206,7 @@ wsw_dt_map(struct sw_winsys *ws,
 
       tr = pipe_get_transfer(pipe, tex, 0, 0,
                              PIPE_TRANSFER_READ_WRITE,
-                             0, 0, wdt->width, wdt->height);
+                             0, 0, wdt->tex->width0, wdt->tex->height0);
       if (!tr)
          return NULL;
 
@@ -248,6 +246,7 @@ wsw_dt_unmap(struct sw_winsys *ws,
 
    pipe->transfer_unmap(pipe, wdt->transfer);
    pipe->transfer_destroy(pipe, wdt->transfer);
+   pipe->flush(pipe, NULL);
    wdt->transfer = NULL;
 }
 
diff --git a/src/gallium/winsys/sw/xlib/SConscript b/src/gallium/winsys/sw/xlib/SConscript
index df01a9ec2b..e9c274059b 100644
--- a/src/gallium/winsys/sw/xlib/SConscript
+++ b/src/gallium/winsys/sw/xlib/SConscript
@@ -4,7 +4,7 @@
 
 Import('*')
 
-if env['platform'] in ('cygwin', 'linux'):
+if env['platform'] in ('cygwin', 'linux', 'sunos'):
 
     env = env.Clone()