[Mesa-dev] [PATCH v4 11/18] anv/cmd_buffer: Always enable CCS_D in render passes
Nanley Chery
nanleychery at gmail.com
Fri Jul 21 23:27:05 UTC 2017
On Fri, Jul 21, 2017 at 03:43:20PM -0700, Jason Ekstrand wrote:
> On Wed, Jul 19, 2017 at 2:22 PM, Nanley Chery <nanleychery at gmail.com> wrote:
>
> > The lifespan of the fast-clear data will surpass the render pass scope.
> > We need CCS_D to be enabled in order to invalidate blocks previously
> > marked as cleared and to sample cleared data correctly.
> >
> > v2: Avoid refactoring.
> > v3: Allow CCS_D for subpass resolves.
> >
> > Signed-off-by: Nanley Chery <nanley.g.chery at intel.com>
> > ---
> > src/intel/vulkan/anv_blorp.c | 26 +++++++++++++++++++-------
> > src/intel/vulkan/genX_cmd_buffer.c | 5 +----
> > 2 files changed, 20 insertions(+), 11 deletions(-)
> >
> > diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c
> > index d6cbc1c0cd..88dbba8a12 100644
> > --- a/src/intel/vulkan/anv_blorp.c
> > +++ b/src/intel/vulkan/anv_blorp.c
> > @@ -1359,8 +1359,10 @@ anv_cmd_buffer_clear_subpass(struct anv_cmd_buffer
> > *cmd_buffer)
> > static void
> > resolve_image(struct blorp_batch *batch,
> > const struct anv_image *src_image,
> > + enum isl_aux_usage src_aux_usage,
> > uint32_t src_level, uint32_t src_layer,
> > const struct anv_image *dst_image,
> > + enum isl_aux_usage dst_aux_usage,
> > uint32_t dst_level, uint32_t dst_layer,
> > VkImageAspectFlags aspect_mask,
> > uint32_t src_x, uint32_t src_y, uint32_t dst_x, uint32_t
> > dst_y,
> > @@ -1377,9 +1379,9 @@ resolve_image(struct blorp_batch *batch,
> >
> > struct blorp_surf src_surf, dst_surf;
> > get_blorp_surf_for_anv_image(src_image, aspect,
> > - src_image->aux_usage, &src_surf);
> > + src_aux_usage, &src_surf);
> > get_blorp_surf_for_anv_image(dst_image, aspect,
> > - dst_image->aux_usage, &dst_surf);
> > + dst_aux_usage, &dst_surf);
> >
> > blorp_blit(batch,
> > &src_surf, src_level, src_layer,
> > @@ -1419,9 +1421,11 @@ void anv_CmdResolveImage(
> >
> > for (uint32_t layer = 0; layer < layer_count; layer++) {
> > resolve_image(&batch,
> > - src_image, pRegions[r].srcSubresource.mipLevel,
> > + src_image, src_image->aux_usage,
> > + pRegions[r].srcSubresource.mipLevel,
> > pRegions[r].srcSubresource.baseArrayLayer + layer,
> > - dst_image, pRegions[r].dstSubresource.mipLevel,
> > + dst_image, dst_image->aux_usage,
> > + pRegions[r].dstSubresource.mipLevel,
> > pRegions[r].dstSubresource.baseArrayLayer + layer,
> > pRegions[r].dstSubresource.aspectMask,
> > pRegions[r].srcOffset.x, pRegions[r].srcOffset.y,
> > @@ -1606,8 +1610,11 @@ ccs_resolve_attachment(struct anv_cmd_buffer
> > *cmd_buffer,
> > cmd_buffer->state.pending_pipe_bits |=
> > ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT | ANV_PIPE_CS_STALL_BIT;
> >
> > + const uint32_t aux_layers =
> > + anv_image_aux_layers(image, iview->isl.base_level);
> >
>
> Should this be anv_image_aux_layers() - base_layer?
>
>
That would be more correct and I considered doing this, but left it as
is for two reasons. The first is that this function is deleted later on
in this series. The second is that subtracting base_layer would give the
same end result for all gens that have been enabled thus far. Please let
me know if I missed anything.
Thanks,
Nanley
> > anv_ccs_resolve(cmd_buffer, att_state->color_rt_state, image,
> > - iview->isl.base_level, fb->layers, resolve_op);
> > + iview->isl.base_level, MIN2(fb->layers, aux_layers),
> > + resolve_op);
> >
> > cmd_buffer->state.pending_pipe_bits |=
> > ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT | ANV_PIPE_CS_STALL_BIT;
> > @@ -1667,6 +1674,11 @@ anv_cmd_buffer_resolve_subpass(struct
> > anv_cmd_buffer *cmd_buffer)
> > struct anv_image_view *src_iview = fb->attachments[src_att];
> > struct anv_image_view *dst_iview = fb->attachments[dst_att];
> >
> > + enum isl_aux_usage src_aux_usage =
> > + cmd_buffer->state.attachments[src_att].aux_usage;
> > + enum isl_aux_usage dst_aux_usage =
> > + cmd_buffer->state.attachments[dst_att].aux_usage;
> > +
> > const VkRect2D render_area = cmd_buffer->state.render_area;
> >
> > assert(src_iview->aspect_mask == dst_iview->aspect_mask);
> > @@ -1674,10 +1686,10 @@ anv_cmd_buffer_resolve_subpass(struct
> > anv_cmd_buffer *cmd_buffer)
> > struct blorp_batch batch;
> > blorp_batch_init(&cmd_buffer->device->blorp, &batch,
> > cmd_buffer, 0);
> >
> > - resolve_image(&batch, src_iview->image,
> > + resolve_image(&batch, src_iview->image, src_aux_usage,
> > src_iview->isl.base_level,
> > src_iview->isl.base_array_layer,
> > - dst_iview->image,
> > + dst_iview->image, dst_aux_usage,
> > dst_iview->isl.base_level,
> > dst_iview->isl.base_array_layer,
> > src_iview->aspect_mask,
> > diff --git a/src/intel/vulkan/genX_cmd_buffer.c
> > b/src/intel/vulkan/genX_cmd_buffer.c
> > index 85938bd91b..42028e286d 100644
> > --- a/src/intel/vulkan/genX_cmd_buffer.c
> > +++ b/src/intel/vulkan/genX_cmd_buffer.c
> > @@ -330,7 +330,7 @@ color_attachment_compute_aux_usage(struct anv_device
> > * device,
> > if (iview->image->aux_usage == ISL_AUX_USAGE_CCS_E) {
> > att_state->aux_usage = ISL_AUX_USAGE_CCS_E;
> > att_state->input_aux_usage = ISL_AUX_USAGE_CCS_E;
> > - } else if (att_state->fast_clear) {
> > + } else {
> > att_state->aux_usage = ISL_AUX_USAGE_CCS_D;
> > /* From the Sky Lake PRM, RENDER_SURFACE_STATE::
> > AuxiliarySurfaceMode:
> > *
> > @@ -347,9 +347,6 @@ color_attachment_compute_aux_usage(struct anv_device
> > * device,
> > att_state->input_aux_usage = ISL_AUX_USAGE_CCS_D;
> > else
> > att_state->input_aux_usage = ISL_AUX_USAGE_NONE;
> > - } else {
> > - att_state->aux_usage = ISL_AUX_USAGE_NONE;
> > - att_state->input_aux_usage = ISL_AUX_USAGE_NONE;
> > }
> > }
> >
> > --
> > 2.13.3
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
> >
More information about the mesa-dev
mailing list