diff options
| author | Eric Anholt <[email protected]> | 2011-09-21 15:17:36 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2011-09-26 15:33:42 -0700 |
| commit | d430e81c3287eba4ee84ca1639a23f92bbe22c8e (patch) | |
| tree | ddbac85c877e544b93339792104458a7f11a79d9 /src/mesa/drivers | |
| parent | fdd4961443d0fbb968c07f5b693c45785ae416f5 (diff) | |
intel: Fix improper freeing of texture data in TFP.
If there happened to be ->Data present, we assertion failed instead of
handling it correctly.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35234
Acked-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_image.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c index 15196c0ebcc..30e1776baa9 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_image.c +++ b/src/mesa/drivers/dri/intel/intel_tex_image.c @@ -686,10 +686,7 @@ intel_set_texture_image_region(struct gl_context *ctx, region->width, region->height, 1, 0, internalFormat, format); - if (intel_image->mt) { - intel_miptree_release(intel, &intel_image->mt); - assert(!image->Data); - } + ctx->Driver.FreeTextureImageBuffer(ctx, image); intel_image->mt = intel_miptree_create_for_region(intel, target, image->TexFormat, |