diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2018-01-22 23:33:53 -0800 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2018-02-09 03:50:10 +0000 |
| commit | 0dd5120deddc97467e18b715390e929b50787e63 (patch) | |
| tree | bd528e72dec73b682b71a6a410357f4d17c80e34 | |
| parent | 1d7d13ffc6778c9ba67f8929458e21f9cfd34f6c (diff) | |
i965/miptree: Take an aux_usage in prepare/finish_render
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>
(cherry picked from commit dfe02179055b2504303e23988ab3d446b40de05a)
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_blorp.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 10 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 6 |
4 files changed, 8 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c index 29fb00f944f..b1ac83b9398 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.c +++ b/src/mesa/drivers/dri/i965/brw_blorp.c @@ -1268,7 +1268,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; @@ -1287,7 +1287,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; diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index 93bbaae8dc2..9d1754cc417 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -514,7 +514,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); @@ -592,7 +592,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); } } diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index af95bde516c..d8a938e2e28 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -2725,11 +2725,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); } @@ -2738,13 +2735,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); } diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h index c3f1bfea5b5..17dcdbca38c 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h @@ -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, |