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

radv: handle VK_QUEUE_FAMILY_IGNORED in image transitions (v3)

Browse source 
The CTS tests at least are using this, and we were totally
ignoring it.

This hopefully fixes the bouncing multisample CTS tests.

v2: get family mask in ignored case from command buffer.
v3: only change things in one place, use logic from Bas.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2017-01-31 15:18:33 +10:00
parent fa316ed02f
commit cda9f3d8ec
4 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,8 +38,8 @@ static void radv_handle_image_transition(struct radv_cmd_buffer *cmd_buffer,
struct radv_image *image,
VkImageLayout src_layout,
VkImageLayout dst_layout,
int src_family,
int dst_family,
uint32_t src_family,
uint32_t dst_family,
VkImageSubresourceRange range,
VkImageAspectFlags pending_clears);
@ -2719,8 +2719,8 @@ static void radv_handle_image_transition(struct radv_cmd_buffer *cmd_buffer,
struct radv_image *image,
VkImageLayout src_layout,
VkImageLayout dst_layout,
int src_family,
int dst_family,
uint32_t src_family,
uint32_t dst_family,
VkImageSubresourceRange range,
VkImageAspectFlags pending_clears)
{
@ -2741,8 +2741,8 @@ static void radv_handle_image_transition(struct radv_cmd_buffer *cmd_buffer,
return;
}
unsigned src_queue_mask = radv_image_queue_family_mask(image, src_family);
unsigned dst_queue_mask = radv_image_queue_family_mask(image, dst_family);
unsigned src_queue_mask = radv_image_queue_family_mask(image, src_family, cmd_buffer->queue_family_index);
unsigned dst_queue_mask = radv_image_queue_family_mask(image, dst_family, cmd_buffer->queue_family_index);
if (image->htile.size)
radv_handle_depth_image_transition(cmd_buffer, image, src_layout,

11
src/amd/vulkan/radv_image.c
View file

@ -905,10 +905,13 @@ bool radv_layout_can_fast_clear(const struct radv_image *image,
}
unsigned radv_image_queue_family_mask(const struct radv_image *image, int family) {
if (image->exclusive)
return 1u <<family;
return image->queue_family_mask;
unsigned radv_image_queue_family_mask(const struct radv_image *image, uint32_t family, uint32_t queue_family)
{
if (!image->exclusive)
return image->queue_family_mask;
if (family == VK_QUEUE_FAMILY_IGNORED)
return 1u << queue_family;
return 1u << family;
}
VkResult

2
src/amd/vulkan/radv_meta_clear.c
View file

@ -844,7 +844,7 @@ emit_fast_color_clear(struct radv_cmd_buffer *cmd_buffer,
if (!(cmd_buffer->device->debug_flags & RADV_DEBUG_FAST_CLEARS))
return false;
if (!radv_layout_can_fast_clear(iview->image, image_layout, radv_image_queue_family_mask(iview->image, cmd_buffer->queue_family_index)))
if (!radv_layout_can_fast_clear(iview->image, image_layout, radv_image_queue_family_mask(iview->image, cmd_buffer->queue_family_index, cmd_buffer->queue_family_index)))
goto fail;
if (vk_format_get_blocksizebits(iview->image->vk_format) > 64)
goto fail;

2
src/amd/vulkan/radv_private.h
View file

@ -1083,7 +1083,7 @@ bool radv_layout_can_fast_clear(const struct radv_image *image,
unsigned queue_mask);
unsigned radv_image_queue_family_mask(const struct radv_image *image, int family);
unsigned radv_image_queue_family_mask(const struct radv_image *image, uint32_t family, uint32_t queue_family);
static inline uint32_t
radv_get_layerCount(const struct radv_image *image,