fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i965: Move unmap_blit before map_blit

Browse source 
Reorder code to avoid a forward declaration in the next patch.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Chris Wilson 2018-04-30 10:25:41 -07:00 • committed by Kenneth Graunke
parent 359624142d
commit f348d07a62
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View file

@ -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.
*/