Browse Source

intel: Drop the "intel" argument to intel_miptree_release().

We don't have it in the other refcounting functions, and it was
totally unused.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
tags/mesa-8.0-rc1
Eric Anholt 14 years ago
parent
commit
db3ada6055

+ 1
- 1
src/mesa/drivers/dri/intel/intel_fbo.c View File

@@ -747,7 +747,7 @@ intel_render_texture(struct gl_context * ctx,
intel_image->base.Base.Level,
old_mt);

intel_miptree_release(intel, &intel_image->mt);
intel_miptree_release(&intel_image->mt);
intel_image->mt = new_mt;
intel_renderbuffer_set_draw_offset(irb, intel_image, att->Zoffset);


+ 1
- 2
src/mesa/drivers/dri/intel/intel_mipmap_tree.c View File

@@ -180,8 +180,7 @@ intel_miptree_reference(struct intel_mipmap_tree **dst,


void
intel_miptree_release(struct intel_context *intel,
struct intel_mipmap_tree **mt)
intel_miptree_release(struct intel_mipmap_tree **mt)
{
if (!*mt)
return;

+ 1
- 2
src/mesa/drivers/dri/intel/intel_mipmap_tree.h View File

@@ -158,8 +158,7 @@ int intel_miptree_pitch_align (struct intel_context *intel,
void intel_miptree_reference(struct intel_mipmap_tree **dst,
struct intel_mipmap_tree *src);

void intel_miptree_release(struct intel_context *intel,
struct intel_mipmap_tree **mt);
void intel_miptree_release(struct intel_mipmap_tree **mt);

/* Check if an image fits an existing mipmap tree layout
*/

+ 3
- 5
src/mesa/drivers/dri/intel/intel_tex.c View File

@@ -43,10 +43,9 @@ static void
intelDeleteTextureObject(struct gl_context *ctx,
struct gl_texture_object *texObj)
{
struct intel_context *intel = intel_context(ctx);
struct intel_texture_object *intelObj = intel_texture_object(texObj);

intel_miptree_release(intel, &intelObj->mt);
intel_miptree_release(&intelObj->mt);
_mesa_delete_texture_object(ctx, texObj);
}

@@ -55,12 +54,11 @@ static void
intel_free_texture_image_buffer(struct gl_context * ctx,
struct gl_texture_image *texImage)
{
struct intel_context *intel = intel_context(ctx);
struct intel_texture_image *intelImage = intel_texture_image(texImage);

DBG("%s\n", __FUNCTION__);

intel_miptree_release(intel, &intelImage->mt);
intel_miptree_release(&intelImage->mt);

if (texImage->Data) {
_mesa_free_texmemory(texImage->Data);
@@ -188,7 +186,7 @@ intelGenerateMipmap(struct gl_context *ctx, GLenum target,
/* Unreference the miptree to signal that the new Data is a
* bare pointer from mesa.
*/
intel_miptree_release(intel, &intelImage->mt);
intel_miptree_release(&intelImage->mt);
}
}
}

+ 1
- 1
src/mesa/drivers/dri/intel/intel_tex_image.c View File

@@ -392,7 +392,7 @@ intelTexImage(struct gl_context * ctx,
* before, and any lower levels would fit into our miptree.
*/
if (intelImage->mt) {
intel_miptree_release(intel, &intelObj->mt);
intel_miptree_release(&intelObj->mt);
intel_miptree_reference(&intelObj->mt, intelImage->mt);
}
}

+ 3
- 5
src/mesa/drivers/dri/intel/intel_tex_validate.c View File

@@ -44,7 +44,7 @@ copy_image_data_to_tree(struct intel_context *intel,
intelImage->base.Base.Face,
intelImage->base.Base.Level, intelImage->mt);

intel_miptree_release(intel, &intelImage->mt);
intel_miptree_release(&intelImage->mt);
}
else {
assert(intelImage->base.Base.Data != NULL);
@@ -92,9 +92,7 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit)
/* Fallback case:
*/
if (firstImage->base.Base.Border) {
if (intelObj->mt) {
intel_miptree_release(intel, &intelObj->mt);
}
intel_miptree_release(&intelObj->mt);
return GL_FALSE;
}

@@ -114,7 +112,7 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit)
intelObj->mt->width0 != firstImage->base.Base.Width ||
intelObj->mt->height0 != firstImage->base.Base.Height ||
intelObj->mt->depth0 != firstImage->base.Base.Depth)) {
intel_miptree_release(intel, &intelObj->mt);
intel_miptree_release(&intelObj->mt);
}



Loading…
Cancel
Save