remove unused screen param from intel_region_release

9 files changed, 20 insertions, 25 deletions

diff --git a/src/mesa/drivers/dri/i915/i830_metaops.c b/src/mesa/drivers/dri/i915/i830_metaops.c
index 73e36fe678..c90f502222 100644
--- a/src/mesa/drivers/dri/i915/i830_metaops.c
+++ b/src/mesa/drivers/dri/i915/i830_metaops.c
@@ -407,10 +407,10 @@ meta_draw_region(struct intel_context *intel,
    GLuint format;
    GLuint depth_format = DEPTH_FRMT_16_FIXED;
 
-   intel_region_release(intel->intelScreen, &i830->meta.draw_region);
+   intel_region_release(&i830->meta.draw_region);
    intel_region_reference(&i830->meta.draw_region, draw_region);
 
-   intel_region_release(intel->intelScreen, &i830->meta.depth_region);
+   intel_region_release(&i830->meta.depth_region);
    intel_region_reference(&i830->meta.depth_region, depth_region);
 
    /* XXX FBO: grab code from i915 meta_draw_region */
@@ -459,8 +459,8 @@ static void
 leave_meta_state(struct intel_context *intel)
 {
    struct i830_context *i830 = i830_context(&intel->ctx);
-   intel_region_release(intel->intelScreen, &i830->meta.draw_region);
-   intel_region_release(intel->intelScreen, &i830->meta.depth_region);
+   intel_region_release(&i830->meta.draw_region);
+   intel_region_release(&i830->meta.depth_region);
 /*    intel_region_release(intel, &i830->meta.tex_region[0]); */
    SET_STATE(i830, state);
 }
diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c
index 325ff86973..45502da290 100644
--- a/src/mesa/drivers/dri/i915/i830_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i830_vtbl.c
@@ -525,8 +525,8 @@ i830_set_draw_region(struct intel_context *intel,
 {
    struct i830_context *i830 = i830_context(&intel->ctx);
 
-   intel_region_release(intel->intelScreen, &i830->state.draw_region);
-   intel_region_release(intel->intelScreen, &i830->state.depth_region);
+   intel_region_release(&i830->state.draw_region);
+   intel_region_release(&i830->state.depth_region);
    intel_region_reference(&i830->state.draw_region, draw_region);
    intel_region_reference(&i830->state.depth_region, depth_region);
 
diff --git a/src/mesa/drivers/dri/i915/i915_metaops.c b/src/mesa/drivers/dri/i915/i915_metaops.c
index 10ec5e910e..3ab62bc806 100644
--- a/src/mesa/drivers/dri/i915/i915_metaops.c
+++ b/src/mesa/drivers/dri/i915/i915_metaops.c
@@ -396,7 +396,7 @@ meta_tex_rect_source(struct intel_context *intel,
       return GL_FALSE;
    }
 
-/*    intel_region_release(intel, &i915->meta.tex_region[0]); */
+/*    intel_region_release(&i915->meta.tex_region[0]); */
 /*    intel_region_reference(&i915->meta.tex_region[0], region); */
    i915->meta.tex_buffer[0] = buffer;
    i915->meta.tex_offset[0] = offset;
@@ -483,9 +483,9 @@ static void
 leave_meta_state(struct intel_context *intel)
 {
    struct i915_context *i915 = i915_context(&intel->ctx);
-   intel_region_release(intel->intelScreen, &i915->meta.draw_region);
-   intel_region_release(intel->intelScreen, &i915->meta.depth_region);
-/*    intel_region_release(intel, &i915->meta.tex_region[0]); */
+   intel_region_release(&i915->meta.draw_region);
+   intel_region_release(&i915->meta.depth_region);
+/*    intel_region_release(&i915->meta.tex_region[0]); */
    SET_STATE(i915, state);
 }
 
diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c
index c927ec8637..827990d2cf 100644
--- a/src/mesa/drivers/dri/i915/i915_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i915_vtbl.c
@@ -448,11 +448,11 @@ i915_state_draw_region(struct intel_context *intel,
    ASSERT(state == &i915->state || state == &i915->meta);
 
    if (state->draw_region != color_region) {
-      intel_region_release(intel->intelScreen, &state->draw_region);
+      intel_region_release(&state->draw_region);
       intel_region_reference(&state->draw_region, color_region);
    }
    if (state->depth_region != depth_region) {
-      intel_region_release(intel->intelScreen, &state->depth_region);
+      intel_region_release(&state->depth_region);
       intel_region_reference(&state->depth_region, depth_region);
    }
 
diff --git a/src/mesa/drivers/dri/i915/intel_buffers.c b/src/mesa/drivers/dri/i915/intel_buffers.c
index 3c9be8448e..e186666b77 100644
--- a/src/mesa/drivers/dri/i915/intel_buffers.c
+++ b/src/mesa/drivers/dri/i915/intel_buffers.c
@@ -943,11 +943,11 @@ intel_draw_buffer(GLcontext * ctx, struct gl_framebuffer *fb)
     **/
 #if 0                           /* XXX FBO: this seems to be redundant with i915_state_draw_region() */
    if (intel->draw_region != colorRegion) {
-      intel_region_release(intel, &intel->draw_region);
+      intel_region_release(&intel->draw_region);
       intel_region_reference(&intel->draw_region, colorRegion);
    }
    if (intel->intelScreen->depth_region != depthRegion) {
-      intel_region_release(intel, &intel->intelScreen->depth_region);
+      intel_region_release(&intel->intelScreen->depth_region);
       intel_region_reference(&intel->intelScreen->depth_region, depthRegion);
    }
 #endif
diff --git a/src/mesa/drivers/dri/i915/intel_fbo.c b/src/mesa/drivers/dri/i915/intel_fbo.c
index 2aab8b1647..42577da612 100644
--- a/src/mesa/drivers/dri/i915/intel_fbo.c
+++ b/src/mesa/drivers/dri/i915/intel_fbo.c
@@ -113,7 +113,7 @@ intel_delete_renderbuffer(struct gl_renderbuffer *rb)
    }
 
    if (intel && irb->region) {
-      intel_region_release(intel->intelScreen, &irb->region);
+      intel_region_release(&irb->region);
    }
 
    _mesa_free(irb);
@@ -227,9 +227,7 @@ intel_alloc_renderbuffer_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
 
    /* free old region */
    if (irb->region) {
-      /*LOCK_HARDWARE(intel); */
-      intel_region_release(intel->intelScreen, &irb->region);
-      /*UNLOCK_HARDWARE(intel); */
+      intel_region_release(&irb->region);
    }
 
    /* allocate new memory region/renderbuffer */
@@ -588,14 +586,13 @@ static void
 intel_finish_render_texture(GLcontext * ctx,
                             struct gl_renderbuffer_attachment *att)
 {
-   struct intel_context *intel = intel_context(ctx);
    struct intel_renderbuffer *irb = intel_renderbuffer(att->Renderbuffer);
 
    DBG("End render texture (tid %u) tex %u\n", _glthread_GetID(), att->Texture->Name);
 
    if (irb) {
       /* just release the region */
-      intel_region_release(intel->intelScreen, &irb->region);
+      intel_region_release(&irb->region);
    }
    else if (att->Renderbuffer) {
       /* software fallback */
diff --git a/src/mesa/drivers/dri/i915/intel_mipmap_tree.c b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
index 1a4298f559..06012c4981 100644
--- a/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
@@ -128,7 +128,7 @@ intel_miptree_release(struct intel_context *intel,
 
       DBG("%s deleting %p\n", __FUNCTION__, *mt);
 
-      intel_region_release(intel->intelScreen, &((*mt)->region));
+      intel_region_release(&((*mt)->region));
 
       for (i = 0; i < MAX_TEXTURE_LEVELS; i++)
          if ((*mt)->level[i].image_offset)
diff --git a/src/mesa/drivers/dri/i915/intel_regions.c b/src/mesa/drivers/dri/i915/intel_regions.c
index c20d3d338a..1f560b9d8a 100644
--- a/src/mesa/drivers/dri/i915/intel_regions.c
+++ b/src/mesa/drivers/dri/i915/intel_regions.c
@@ -113,8 +113,7 @@ intel_region_reference(struct intel_region **dst, struct intel_region *src)
 }
 
 void
-intel_region_release(intelScreenPrivate *intelScreen,
-                     struct intel_region **region)
+intel_region_release(struct intel_region **region)
 {
    if (!*region)
       return;
diff --git a/src/mesa/drivers/dri/i915/intel_regions.h b/src/mesa/drivers/dri/i915/intel_regions.h
index b08c79ec3e..1415bace69 100644
--- a/src/mesa/drivers/dri/i915/intel_regions.h
+++ b/src/mesa/drivers/dri/i915/intel_regions.h
@@ -68,8 +68,7 @@ struct intel_region *intel_region_alloc(intelScreenPrivate *intelScreen,
 void intel_region_reference(struct intel_region **dst,
                             struct intel_region *src);
 
-void intel_region_release(intelScreenPrivate *intelScreen,
-                          struct intel_region **ib);
+void intel_region_release(struct intel_region **ib);
 
 extern struct intel_region 
 *intel_region_create_static(intelScreenPrivate *intelScreen,