From 5cbff0932e498f49b57cbb71037b93416bfe30e0 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 8 Feb 2011 08:05:14 -0700 Subject: [PATCH] st/mesa: free the temporary bitmap/drawpix shader code Fixes a per-shader memory leak when drawing glBitmaps, glDrawPixels or glCopyPixels. NOTE: This is a candidate for the 7.9 and 7.10 branches. --- src/mesa/state_tracker/st_program.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 7b32b46838a..f6e44458492 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -413,7 +413,7 @@ st_translate_fragment_program(struct st_context *st, #if FEATURE_drawpix if (key->bitmap) { /* glBitmap drawing */ - struct gl_fragment_program *fp; + struct gl_fragment_program *fp; /* we free this temp program below */ st_make_bitmap_fragment_program(st, &stfp->Base, &fp, &variant->bitmap_sampler); @@ -423,7 +423,7 @@ st_translate_fragment_program(struct st_context *st, } else if (key->drawpixels) { /* glDrawPixels drawing */ - struct gl_fragment_program *fp; + struct gl_fragment_program *fp; /* we free this temp program below */ if (key->drawpixels_z || key->drawpixels_stencil) { fp = st_make_drawpix_z_stencil_program(st, key->drawpixels_z, @@ -630,6 +630,14 @@ st_translate_fragment_program(struct st_context *st, debug_printf("\n"); } +#if FEATURE_drawpix + if (key->bitmap || key->drawpixels) { + /* Free the temporary program made above */ + struct gl_fragment_program *fp = &stfp->Base; + _mesa_reference_fragprog(st->ctx, &fp, NULL); + } +#endif + return variant; } -- 2.30.2