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

hasvk: Handle subpass self-dependencies for stencil shadow copies

Browse source 
Always copying when dstAccessMask includes texture operations is not
optimal, but it's good enough.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19876>
This commit is contained in:
Väinö Mäkelä 2022-11-19 21:18:24 +02:00 • committed by Marge Bot
parent d3162f97b5
commit d6d8edf9ae
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/intel/vulkan_hasvk/anv_blorp.c
View file

@ -1486,7 +1486,12 @@ anv_image_copy_to_shadow(struct anv_cmd_buffer *cmd_buffer,
uint32_t base_layer, uint32_t layer_count)
{
struct blorp_batch batch;
anv_blorp_batch_init(cmd_buffer, &batch, 0);
anv_blorp_batch_init(cmd_buffer, &batch,
/* If the sample count is set, we are in a render pass
* and don't want blorp to overwrite depth/stencil
* state
*/
cmd_buffer->state.gfx.samples ? BLORP_BATCH_NO_EMIT_DEPTH_STENCIL : 0);
/* We don't know who touched the main surface last so flush a bunch of
* caches to ensure we get good data.

16
src/intel/vulkan_hasvk/genX_cmd_buffer.c
View file

@ -1979,6 +1979,22 @@ cmd_buffer_barrier(struct anv_cmd_buffer *cmd_buffer,
img_barrier->oldLayout,
img_barrier->newLayout,
false /* will_full_fast_clear */);
/* If we are in a renderpass, the gfx7 stencil shadow may need to be
* updated even if the layout doesn't change
*/
if (cmd_buffer->state.gfx.samples &&
(img_barrier->dstAccessMask & (VK_ACCESS_2_SHADER_READ_BIT |
VK_ACCESS_2_SHADER_SAMPLED_READ_BIT |
VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT))) {
const uint32_t plane =
anv_image_aspect_to_plane(image, VK_IMAGE_ASPECT_STENCIL_BIT);
if (anv_surface_is_valid(&image->planes[plane].shadow_surface))
anv_image_copy_to_shadow(cmd_buffer, image,
VK_IMAGE_ASPECT_STENCIL_BIT,
range->baseMipLevel, level_count,
base_layer, layer_count);
}
}
if (range->aspectMask & VK_IMAGE_ASPECT_ANY_COLOR_BIT_ANV) {