From f348d07a62ca9200ce7d8636942cb882fbbd471d Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 30 Apr 2018 10:25:41 -0700 Subject: [PATCH] i965: Move unmap_blit before map_blit Reorder code to avoid a forward declaration in the next patch. Signed-off-by: Chris Wilson Acked-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index ccd5b4bf023..22947c202c2 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -3118,6 +3118,28 @@ intel_miptree_map_gtt(struct brw_context *brw, x, y, map->ptr, map->stride); } +static void +intel_miptree_unmap_blit(struct brw_context *brw, + struct intel_mipmap_tree *mt, + struct intel_miptree_map *map, + unsigned int level, + unsigned int slice) +{ + struct gl_context *ctx = &brw->ctx; + + intel_miptree_unmap_raw(map->linear_mt); + + if (map->mode & GL_MAP_WRITE_BIT) { + bool ok = intel_miptree_copy(brw, + map->linear_mt, 0, 0, 0, 0, + mt, level, slice, map->x, map->y, + map->w, map->h); + WARN_ONCE(!ok, "Failed to blit from linear temporary mapping"); + } + + intel_miptree_release(&map->linear_mt); +} + static void intel_miptree_map_blit(struct brw_context *brw, struct intel_mipmap_tree *mt, @@ -3167,28 +3189,6 @@ fail: map->stride = 0; } -static void -intel_miptree_unmap_blit(struct brw_context *brw, - struct intel_mipmap_tree *mt, - struct intel_miptree_map *map, - unsigned int level, - unsigned int slice) -{ - struct gl_context *ctx = &brw->ctx; - - intel_miptree_unmap_raw(map->linear_mt); - - if (map->mode & GL_MAP_WRITE_BIT) { - bool ok = intel_miptree_copy(brw, - map->linear_mt, 0, 0, 0, 0, - mt, level, slice, map->x, map->y, - map->w, map->h); - WARN_ONCE(!ok, "Failed to blit from linear temporary mapping"); - } - - intel_miptree_release(&map->linear_mt); -} - /** * "Map" a buffer by copying it to an untiled temporary using MOVNTDQA. */ -- 2.30.2