mt->pitch must be at least 16 because of 64-byte alignment in sp_region.c (fix that someday)

1 files changed, 6 insertions, 0 deletions

diff --git a/src/mesa/pipe/softpipe/sp_tex_layout.c b/src/mesa/pipe/softpipe/sp_tex_layout.c
index 37969c84de7..bd5f5e930da 100644
--- a/src/mesa/pipe/softpipe/sp_tex_layout.c
+++ b/src/mesa/pipe/softpipe/sp_tex_layout.c
@@ -116,6 +116,12 @@ sp_miptree_layout_2d( struct pipe_mipmap_tree *mt )
    GLuint height = mt->height0;
 
    mt->pitch = mt->width0;
+   /* XXX FIX THIS:
+    * we use alignment=64 bytes in sp_region_alloc(). If we change
+    * that, change this too.
+    */
+   if (mt->pitch < 16)
+      mt->pitch = 16;
 
    /* May need to adjust pitch to accomodate the placement of
     * the 2nd mipmap.  This occurs when the alignment