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 <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2011-09-21 15:17:36 -07:00
parent fdd4961443
commit d430e81c32

View file

@ -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,