Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

Conflicts:

	src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
	src/mesa/pipe/Makefile
	src/mesa/pipe/draw/draw_vertex_fetch.c
	src/mesa/pipe/i915simple/i915_texture.c
	src/mesa/pipe/softpipe/sp_texture.c
	src/mesa/pipe/xlib/xm_winsys.c
	src/mesa/state_tracker/st_cb_fbo.c

1 files changed, 9 insertions, 1 deletions

diff --git a/src/mesa/pipe/draw/draw_wide_prims.c b/src/mesa/pipe/draw/draw_wide_prims.c
index 494a2bc619..a56c9b8893 100644
--- a/src/mesa/pipe/draw/draw_wide_prims.c
+++ b/src/mesa/pipe/draw/draw_wide_prims.c
@@ -315,7 +315,6 @@ static void wide_begin( struct draw_stage *stage )
 }
 
 
-
 static void wide_end( struct draw_stage *stage )
 {
    stage->next->end( stage->next );
@@ -327,6 +326,14 @@ static void draw_reset_stipple_counter( struct draw_stage *stage )
    stage->next->reset_stipple_counter( stage->next );
 }
 
+
+static void wide_destroy( struct draw_stage *stage )
+{
+   draw_free_tmps( stage );
+   FREE( stage );
+}
+
+
 struct draw_stage *draw_wide_stage( struct draw_context *draw )
 {
    struct wide_stage *wide = CALLOC_STRUCT(wide_stage);
@@ -341,6 +348,7 @@ struct draw_stage *draw_wide_stage( struct draw_context *draw )
    wide->stage.tri = passthrough_tri;
    wide->stage.end = wide_end;
    wide->stage.reset_stipple_counter = draw_reset_stipple_counter;
+   wide->stage.destroy = wide_destroy;
 
    return &wide->stage;
 }