fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 23:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

anv: Use subpass dependencies for flushes

Browse source 
Instead of figuring it all out ourselves, just use the information given
to us by the client.

Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
This commit is contained in:
Jason Ekstrand 2017-03-10 17:50:01 -08:00
parent e5bbf8be36
commit bc68aa42bd
2 changed files with 18 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
src/intel/vulkan/anv_blorp.c
View file

@ -1093,80 +1093,6 @@ enum subpass_stage {
SUBPASS_STAGE_RESOLVE,
};
static bool
attachment_needs_flush(struct anv_cmd_buffer *cmd_buffer,
struct anv_render_pass_attachment *att,
enum subpass_stage stage)
{
struct anv_render_pass *pass = cmd_buffer->state.pass;
const uint32_t subpass_idx = anv_get_subpass_id(&cmd_buffer->state);
/* We handle this subpass specially based on the current stage */
enum anv_subpass_usage usage = att->subpass_usage[subpass_idx];
switch (stage) {
case SUBPASS_STAGE_LOAD:
if (usage & (ANV_SUBPASS_USAGE_INPUT | ANV_SUBPASS_USAGE_RESOLVE_SRC))
return true;
break;
case SUBPASS_STAGE_DRAW:
if (usage & ANV_SUBPASS_USAGE_RESOLVE_SRC)
return true;
break;
default:
break;
}
for (uint32_t s = subpass_idx + 1; s < pass->subpass_count; s++) {
usage = att->subpass_usage[s];
/* If this attachment is going to be used as an input in this or any
* future subpass, then we need to flush its cache and invalidate the
* texture cache.
*/
if (att->subpass_usage[s] & ANV_SUBPASS_USAGE_INPUT)
return true;
if (usage & (ANV_SUBPASS_USAGE_DRAW | ANV_SUBPASS_USAGE_RESOLVE_DST)) {
/* We found another subpass that draws to this attachment. We'll
* wait to resolve until then.
*/
return false;
}
}
return false;
}
static void
anv_cmd_buffer_flush_attachments(struct anv_cmd_buffer *cmd_buffer,
enum subpass_stage stage)
{
struct anv_subpass *subpass = cmd_buffer->state.subpass;
struct anv_render_pass *pass = cmd_buffer->state.pass;
for (uint32_t i = 0; i < subpass->color_count; ++i) {
uint32_t att = subpass->color_attachments[i].attachment;
assert(att < pass->attachment_count);
if (attachment_needs_flush(cmd_buffer, &pass->attachments[att], stage)) {
cmd_buffer->state.pending_pipe_bits |=
ANV_PIPE_TEXTURE_CACHE_INVALIDATE_BIT |
ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT;
}
}
if (subpass->depth_stencil_attachment.attachment != VK_ATTACHMENT_UNUSED) {
uint32_t att = subpass->depth_stencil_attachment.attachment;
assert(att < pass->attachment_count);
if (attachment_needs_flush(cmd_buffer, &pass->attachments[att], stage)) {
cmd_buffer->state.pending_pipe_bits |=
ANV_PIPE_TEXTURE_CACHE_INVALIDATE_BIT |
ANV_PIPE_DEPTH_CACHE_FLUSH_BIT;
}
}
}
static bool
subpass_needs_clear(const struct anv_cmd_buffer *cmd_buffer)
{
@ -1351,8 +1277,6 @@ anv_cmd_buffer_clear_subpass(struct anv_cmd_buffer *cmd_buffer)
}
blorp_batch_finish(&batch);
anv_cmd_buffer_flush_attachments(cmd_buffer, SUBPASS_STAGE_LOAD);
}
static void
@ -1593,9 +1517,15 @@ anv_cmd_buffer_resolve_subpass(struct anv_cmd_buffer *cmd_buffer)
subpass->color_attachments[i].attachment);
}
anv_cmd_buffer_flush_attachments(cmd_buffer, SUBPASS_STAGE_DRAW);
if (subpass->has_resolve) {
/* We are about to do some MSAA resolves. We need to flush so that the
* result of writes to the MSAA color attachments show up in the sampler
* when we blit to the single-sampled resolve target.
*/
cmd_buffer->state.pending_pipe_bits |=
ANV_PIPE_TEXTURE_CACHE_INVALIDATE_BIT |
ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT;
for (uint32_t i = 0; i < subpass->color_count; ++i) {
uint32_t src_att = subpass->color_attachments[i].attachment;
uint32_t dst_att = subpass->resolve_attachments[i].attachment;
@ -1633,8 +1563,6 @@ anv_cmd_buffer_resolve_subpass(struct anv_cmd_buffer *cmd_buffer)
ccs_resolve_attachment(cmd_buffer, &batch, dst_att);
}
anv_cmd_buffer_flush_attachments(cmd_buffer, SUBPASS_STAGE_RESOLVE);
}
blorp_batch_finish(&batch);

10
src/intel/vulkan/genX_cmd_buffer.c
View file

@ -2504,6 +2504,9 @@ void genX(CmdBeginRenderPass)(
genX(flush_pipeline_select_3d)(cmd_buffer);
genX(cmd_buffer_set_subpass)(cmd_buffer, pass->subpasses);
cmd_buffer->state.pending_pipe_bits |=
cmd_buffer->state.pass->subpass_flushes[0];
}
void genX(CmdNextSubpass)(
@ -2524,6 +2527,10 @@ void genX(CmdNextSubpass)(
cmd_buffer_subpass_transition_layouts(cmd_buffer, true);
genX(cmd_buffer_set_subpass)(cmd_buffer, cmd_buffer->state.subpass + 1);
uint32_t subpass_id = anv_get_subpass_id(&cmd_buffer->state);
cmd_buffer->state.pending_pipe_bits |=
cmd_buffer->state.pass->subpass_flushes[subpass_id];
}
void genX(CmdEndRenderPass)(
@ -2540,6 +2547,9 @@ void genX(CmdEndRenderPass)(
*/
cmd_buffer_subpass_transition_layouts(cmd_buffer, true);
cmd_buffer->state.pending_pipe_bits |=
cmd_buffer->state.pass->subpass_flushes[cmd_buffer->state.pass->subpass_count];
cmd_buffer->state.hiz_enabled = false;
#ifndef NDEBUG