OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: free the temporary bitmap/drawpix shader code

Browse Source 
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:
Brian Paul
2011-02-08 08:05:14 -07:00
parent 1ee71bdc8a
commit 5cbff0932e
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/state_tracker/st_program.c
View File

@@ -413,7 +413,7 @@ st_translate_fragment_program(struct st_context *st,
#if FEATURE_drawpix #if FEATURE_drawpix
if (key->bitmap) { if (key->bitmap) {
/* glBitmap drawing */ /* 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, st_make_bitmap_fragment_program(st, &stfp->Base,
&fp, &variant->bitmap_sampler); &fp, &variant->bitmap_sampler);
@@ -423,7 +423,7 @@ st_translate_fragment_program(struct st_context *st,
} }
else if (key->drawpixels) { else if (key->drawpixels) {
/* glDrawPixels drawing */ /* 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) { if (key->drawpixels_z || key->drawpixels_stencil) {
fp = st_make_drawpix_z_stencil_program(st, key->drawpixels_z, 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"); 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; return variant;
} }