summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2011-09-21 15:34:35 -0700
committerEric Anholt <[email protected]>2011-09-26 15:33:42 -0700
commitdb3ada6055814a4bd5aa95fc9505fc101864391d (patch)
tree163e9576d1c25c8eb3169258dea39eac6cb93d42 /src/mesa/drivers
parentabaebcee787eeb8a89bf7a82ed4d1532fcde5e39 (diff)
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 <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/intel/intel_fbo.c2
-rw-r--r--src/mesa/drivers/dri/intel/intel_mipmap_tree.c3
-rw-r--r--src/mesa/drivers/dri/intel/intel_mipmap_tree.h3
-rw-r--r--src/mesa/drivers/dri/intel/intel_tex.c8
-rw-r--r--src/mesa/drivers/dri/intel/intel_tex_image.c2
-rw-r--r--src/mesa/drivers/dri/intel/intel_tex_validate.c8
6 files changed, 10 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index 315108e4732..c0fb8d89bb5 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -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);
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index df9e45981a9..fb4695ce635 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -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;
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
index 0ecb469c060..0d4d2f91f7a 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
@@ -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
*/
diff --git a/src/mesa/drivers/dri/intel/intel_tex.c b/src/mesa/drivers/dri/intel/intel_tex.c
index 3ce5b906b73..61e705c7d25 100644
--- a/src/mesa/drivers/dri/intel/intel_tex.c
+++ b/src/mesa/drivers/dri/intel/intel_tex.c
@@ -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);
}
}
}
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index cbc9a49cb10..69da0e25d1f 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -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);
}
}
diff --git a/src/mesa/drivers/dri/intel/intel_tex_validate.c b/src/mesa/drivers/dri/intel/intel_tex_validate.c
index 59f39def204..59354d66e34 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_validate.c
@@ -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);
}