diff options
| author | Eric Anholt <[email protected]> | 2011-09-21 15:20:20 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2011-09-26 15:33:42 -0700 |
| commit | abaebcee787eeb8a89bf7a82ed4d1532fcde5e39 (patch) | |
| tree | 7c87d2d3927e9ea0c14db3444e6bf6d7bbbf2535 /src | |
| parent | d430e81c3287eba4ee84ca1639a23f92bbe22c8e (diff) | |
intel: Drop the immediate validation of the texture object in TFP.
It's totally gratuitous -- the image's miptree will be checked for
binding to the object later, anyway, with zero-copy or blitting as
appropriate.
Tested-by: Kristian Høgsberg <[email protected]>
Acked-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_image.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c index 30e1776baa9..cbc9a49cb10 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_image.c +++ b/src/mesa/drivers/dri/intel/intel_tex_image.c @@ -679,8 +679,6 @@ intel_set_texture_image_region(struct gl_context *ctx, { struct intel_context *intel = intel_context(ctx); struct intel_texture_image *intel_image = intel_texture_image(image); - struct gl_texture_object *texobj = image->TexObject; - struct intel_texture_object *intel_texobj = intel_texture_object(texobj); _mesa_init_teximage_fields(&intel->ctx, target, image, region->width, region->height, 1, @@ -695,14 +693,6 @@ intel_set_texture_image_region(struct gl_context *ctx, return; image->RowStride = region->pitch; - - /* Immediately validate the image to the object. */ - if (intel_texobj->mt) - intel_miptree_release(intel, &intel_texobj->mt); - intel_miptree_reference(&intel_texobj->mt, intel_image->mt); - - if (!intel_miptree_match_image(intel_texobj->mt, &intel_image->base.Base)) - fprintf(stderr, "miptree doesn't match image\n"); } void |