diff options
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_tex_copy.c | 19 |
1 files changed, 6 insertions, 13 deletions
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); } |