diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-10 12:06:59 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-10 12:06:59 +1100 |
| commit | 5c1a5b504705214fd5e90b33bb3034e75f6b5994 (patch) | |
| tree | ac6e3bd4cb94979ad1fce57a3fd01249253ef3ae /src/mesa/pipe/draw/draw_clip.c | |
| parent | 1a3987240a547ba6e625c864f10a033858de4c65 (diff) | |
| parent | f8f9580a2a1c89af1dc0e169b62440053d9d7e81 (diff) | |
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
Diffstat (limited to 'src/mesa/pipe/draw/draw_clip.c')
| -rw-r--r-- | src/mesa/pipe/draw/draw_clip.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/pipe/draw/draw_clip.c b/src/mesa/pipe/draw/draw_clip.c index e4c257a0ee..c50376f11f 100644 --- a/src/mesa/pipe/draw/draw_clip.c +++ b/src/mesa/pipe/draw/draw_clip.c @@ -415,6 +415,13 @@ static void clip_reset_stipple_counter( struct draw_stage *stage ) } +static void clip_destroy( struct draw_stage *stage ) +{ + draw_free_tmps( stage ); + FREE( stage ); +} + + /** * Allocate a new clipper stage. * \return pointer to new stage object @@ -432,6 +439,7 @@ struct draw_stage *draw_clip_stage( struct draw_context *draw ) clipper->stage.tri = clip_tri; clipper->stage.end = clip_end; clipper->stage.reset_stipple_counter = clip_reset_stipple_counter; + clipper->stage.destroy = clip_destroy; clipper->plane = draw->plane; |