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

i965/miptree: Take an aux_usage in prepare/finish_render

Browse source 
Both callers of intel_miptree_prepare/finish_render have to call
intel_miptree_render_aux_usage anyway for other reasons.  They may as
well pass the result in instead of us calling it again.

Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand 2018-01-22 23:33:53 -08:00
parent 7d4007d58a
commit dfe0217905
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/i965/brw_blorp.c
View file

@ -1269,7 +1269,7 @@ do_single_blorp_clear(struct brw_context *brw, struct gl_framebuffer *fb,
enum isl_aux_usage aux_usage =
intel_miptree_render_aux_usage(brw, irb->mt, isl_format, false);
intel_miptree_prepare_render(brw, irb->mt, level, irb->mt_layer,
num_layers, isl_format, false);
num_layers, aux_usage);
struct isl_surf isl_tmp[2];
struct blorp_surf surf;
@ -1288,7 +1288,7 @@ do_single_blorp_clear(struct brw_context *brw, struct gl_framebuffer *fb,
blorp_batch_finish(&batch);
intel_miptree_finish_render(brw, irb->mt, level, irb->mt_layer,
num_layers, isl_format, false);
num_layers, aux_usage);
}
return;

4
src/mesa/drivers/dri/i965/brw_draw.c
View file

@ -553,7 +553,7 @@ brw_predraw_resolve_framebuffer(struct brw_context *brw)
intel_miptree_prepare_render(brw, irb->mt, irb->mt_level,
irb->mt_layer, irb->layer_count,
isl_format, blend_enabled);
aux_usage);
brw_cache_flush_for_render(brw, irb->mt->bo,
isl_format, aux_usage);
@ -631,7 +631,7 @@ brw_postdraw_set_buffers_need_resolve(struct brw_context *brw)
intel_miptree_finish_render(brw, irb->mt, irb->mt_level,
irb->mt_layer, irb->layer_count,
isl_format, blend_enabled);
aux_usage);
}
}

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

@ -2724,11 +2724,8 @@ void
intel_miptree_prepare_render(struct brw_context *brw,
struct intel_mipmap_tree *mt, uint32_t level,
uint32_t start_layer, uint32_t layer_count,
enum isl_format render_format,
bool blend_enabled)
enum isl_aux_usage aux_usage)
{
enum isl_aux_usage aux_usage =
intel_miptree_render_aux_usage(brw, mt, render_format, blend_enabled);
intel_miptree_prepare_access(brw, mt, level, 1, start_layer, layer_count,
aux_usage, aux_usage != ISL_AUX_USAGE_NONE);
}
@ -2737,13 +2734,10 @@ void
intel_miptree_finish_render(struct brw_context *brw,
struct intel_mipmap_tree *mt, uint32_t level,
uint32_t start_layer, uint32_t layer_count,
enum isl_format render_format,
bool blend_enabled)
enum isl_aux_usage aux_usage)
{
assert(_mesa_is_format_color_format(mt->format));
enum isl_aux_usage aux_usage =
intel_miptree_render_aux_usage(brw, mt, render_format, blend_enabled);
intel_miptree_finish_write(brw, mt, level, start_layer, layer_count,
aux_usage);
}

6
src/mesa/drivers/dri/i965/intel_mipmap_tree.h
View file

@ -657,14 +657,12 @@ void
intel_miptree_prepare_render(struct brw_context *brw,
struct intel_mipmap_tree *mt, uint32_t level,
uint32_t start_layer, uint32_t layer_count,
enum isl_format render_format,
bool blend_enabled);
enum isl_aux_usage aux_usage);
void
intel_miptree_finish_render(struct brw_context *brw,
struct intel_mipmap_tree *mt, uint32_t level,
uint32_t start_layer, uint32_t layer_count,
enum isl_format render_format,
bool blend_enabled);
enum isl_aux_usage aux_usage);
void
intel_miptree_prepare_depth(struct brw_context *brw,
struct intel_mipmap_tree *mt, uint32_t level,