From: Ian Romanick Date: Mon, 19 Jun 2017 19:28:54 +0000 (-0700) Subject: i965: Remove spurious mutex frobbing around call to intel_miptree_blit X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c06b1d3c16e54bd6d65ead68e94939d9b4fdcddd;p=mesa.git i965: Remove spurious mutex frobbing around call to intel_miptree_blit These locks were added in 2f28a0dc, but I don't see anything in the intel_miptree_blit path that should make this necessary. When asked, Kristian says: I doubt it's needed now with the new blorp. If I remember correctly, I had to drop the lock there since intel_miptree_blit() could hit the XY blit path that requires a fast clear resolve. The fast resolve being meta, would then try to lock the texture again. Signed-off-by: Ian Romanick Reviewed-by: Kristian Høgsberg --- diff --git a/src/mesa/drivers/dri/i965/intel_tex_copy.c b/src/mesa/drivers/dri/i965/intel_tex_copy.c index 9c255ae82b6..e0d5cadb6f6 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_copy.c +++ b/src/mesa/drivers/dri/i965/intel_tex_copy.c @@ -51,7 +51,6 @@ intel_copy_texsubimage(struct brw_context *brw, GLint x, GLint y, GLsizei width, GLsizei height) { const GLenum internalFormat = intelImage->base.Base.InternalFormat; - bool ret; /* No pixel transfer operations (zoom, bias, mapping), just a blit */ if (brw->ctx._ImageTransferState) @@ -83,19 +82,13 @@ intel_copy_texsubimage(struct brw_context *brw, int dst_slice = slice + intelImage->base.Base.Face + intelImage->base.Base.TexObject->MinLayer; - _mesa_unlock_texture(&brw->ctx, intelImage->base.Base.TexObject); - /* blit from src buffer to texture */ - ret = intel_miptree_blit(brw, - irb->mt, irb->mt_level, irb->mt_layer, - x, y, irb->Base.Base.Name == 0, - intelImage->mt, dst_level, dst_slice, - dstx, dsty, false, - width, height, GL_COPY); - - _mesa_lock_texture(&brw->ctx, intelImage->base.Base.TexObject); - - return ret; + return intel_miptree_blit(brw, + irb->mt, irb->mt_level, irb->mt_layer, + x, y, irb->Base.Base.Name == 0, + intelImage->mt, dst_level, dst_slice, + dstx, dsty, false, + width, height, GL_COPY); }