fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-03 21:40:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

radv: fix initializing the DS clear metadata value for separate aspects

Browse source 
We shouldn't overwrite the clear value of the other aspect (in case
separate depth/stencil layouts are used).

Found by inspection.

Cc: 21.2 mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12222>
(cherry picked from commit 1db36422b9)
This commit is contained in:
Samuel Pitoiset 2021-08-05 17:47:02 +02:00 • committed by Dylan Baker
parent ee5df9e744
commit c63674ee71
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -364,7 +364,7 @@
"description": "radv: fix initializing the DS clear metadata value for separate aspects",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

6
src/amd/vulkan/radv_cmd_buffer.c
View file

@ -6599,7 +6599,6 @@ static void
radv_initialize_htile(struct radv_cmd_buffer *cmd_buffer, struct radv_image *image,
const VkImageSubresourceRange *range)
{
VkImageAspectFlags aspects = VK_IMAGE_ASPECT_DEPTH_BIT;
struct radv_cmd_state *state = &cmd_buffer->state;
uint32_t htile_value = radv_get_htile_initial_value(cmd_buffer->device, image);
VkClearDepthStencilValue value = {0};
@ -6615,10 +6614,7 @@ radv_initialize_htile(struct radv_cmd_buffer *cmd_buffer, struct radv_image *ima
state->flush_bits |= radv_clear_htile(cmd_buffer, image, range, htile_value);
if (vk_format_has_stencil(image->vk_format))
aspects |= VK_IMAGE_ASPECT_STENCIL_BIT;
radv_set_ds_clear_metadata(cmd_buffer, image, range, value, aspects);
radv_set_ds_clear_metadata(cmd_buffer, image, range, value, range->aspectMask);
if (radv_image_is_tc_compat_htile(image) && (range->aspectMask & VK_IMAGE_ASPECT_DEPTH_BIT)) {
/* Initialize the TC-compat metada value to 0 because by