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.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user