4 files changed, 22 insertions, 2 deletions
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index df4e0cbd5a..809b165f45 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -244,7 +244,7 @@ struct pipe_context *softpipe_create( struct pipe_winsys *pipe_winsys,
    uint i;
 
 #if defined(__i386__) || defined(__386__)
-   softpipe->use_sse = GETENV( "GALLIUM_SSE" ) != NULL;
+   softpipe->use_sse = GETENV( "GALLIUM_NOSSE" ) == NULL;
 #else
    softpipe->use_sse = FALSE;
 #endif
diff --git a/src/mesa/pipe/softpipe/sp_prim_setup.c b/src/mesa/pipe/softpipe/sp_prim_setup.c
index 9f5a43a827..6980564bdc 100644
--- a/src/mesa/pipe/softpipe/sp_prim_setup.c
+++ b/src/mesa/pipe/softpipe/sp_prim_setup.c
@@ -1124,6 +1124,12 @@ static void reset_stipple_counter( struct draw_stage *stage )
 }
 
 
+static void render_destroy( struct draw_stage *stage )
+{
+   FREE( stage );
+}
+
+
 /**
  * Create a new primitive setup/render stage.
  */
@@ -1139,6 +1145,7 @@ struct draw_stage *sp_draw_render_stage( struct softpipe_context *softpipe )
    setup->stage.tri = setup_tri;
    setup->stage.end = setup_end;
    setup->stage.reset_stipple_counter = reset_stipple_counter;
+   setup->stage.destroy = render_destroy;
 
    setup->quad.coef = setup->coef;
 
diff --git a/src/mesa/pipe/softpipe/sp_prim_vbuf.c b/src/mesa/pipe/softpipe/sp_prim_vbuf.c
index 59cf1c4eb7..2cfdeb5809 100644
--- a/src/mesa/pipe/softpipe/sp_prim_vbuf.c
+++ b/src/mesa/pipe/softpipe/sp_prim_vbuf.c
@@ -275,6 +275,16 @@ static void reset_stipple_counter( struct draw_stage *stage )
 }
 
 
+static void vbuf_destroy( struct draw_stage *stage )
+{
+   struct vbuf_stage *vbuf = vbuf_stage( stage );
+
+   FREE( vbuf->element_map );
+   FREE( vbuf->vertex_map );
+   FREE( stage );
+}
+
+
 /**
  * Create a new primitive vbuf/render stage.
  */
@@ -290,6 +300,7 @@ struct draw_stage *sp_draw_vbuf_stage( struct draw_context *draw_context,
    vbuf->stage.tri = vbuf_first_tri;
    vbuf->stage.end = vbuf_end;
    vbuf->stage.reset_stipple_counter = reset_stipple_counter;
+   vbuf->stage.destroy = vbuf_destroy;
 
    vbuf->pipe = pipe;
    vbuf->draw = draw;
diff --git a/src/mesa/pipe/softpipe/sp_texture.c b/src/mesa/pipe/softpipe/sp_texture.c
index 2288c343bf..cfe9628184 100644
--- a/src/mesa/pipe/softpipe/sp_texture.c
+++ b/src/mesa/pipe/softpipe/sp_texture.c
@@ -382,7 +382,9 @@ softpipe_texture_create(struct pipe_context *pipe, struct pipe_texture **pt)
 
       if (softpipe_mipmap_tree_layout(pipe, spt)) {
 	 spt->buffer = pipe->winsys->buffer_create(pipe->winsys,
-						   PIPE_SURFACE_FLAG_TEXTURE);
+						   32,
+						   PIPE_SURFACE_FLAG_TEXTURE,
+						   0);
 
 	 if (spt->buffer) {
 	    pipe->winsys->buffer_data(pipe->winsys, spt->buffer,