AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: fix potential clears with non renderable images on GFX9+

Browse Source 
Found by inspection.

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/9474>
This commit is contained in:
Samuel Pitoiset
2021-03-09 14:05:28 +01:00
committed by Marge Bot
parent 9863ed9bf3
commit 15fc0c351a
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/vulkan/radv_meta_clear.c
+1 -3
View File
@@ -2280,9 +2280,7 @@ void radv_CmdClearColorImage(
bool cs;
cs = cmd_buffer->queue_family_index == RADV_QUEUE_COMPUTE ||
image->vk_format == VK_FORMAT_R32G32B32_UINT ||
image->vk_format == VK_FORMAT_R32G32B32_SINT ||
image->vk_format == VK_FORMAT_R32G32B32_SFLOAT;
!radv_image_is_renderable(cmd_buffer->device, image);
if (cs) {
radv_meta_save(&saved_state, cmd_buffer,
src/amd/vulkan/radv_meta_copy.c
+4 -4
View File
@@ -104,8 +104,8 @@ blit_surf_for_image_level_layer(struct radv_image *image,
};
}
static bool
image_is_renderable(struct radv_device *device, struct radv_image *image)
bool
radv_image_is_renderable(struct radv_device *device, struct radv_image *image)
{
if (image->vk_format == VK_FORMAT_R32G32B32_UINT ||
image->vk_format == VK_FORMAT_R32G32B32_SINT ||
@@ -137,7 +137,7 @@ copy_buffer_to_image(struct radv_cmd_buffer *cmd_buffer,
assert(image->info.samples == 1);
cs = cmd_buffer->queue_family_index == RADV_QUEUE_COMPUTE ||
!image_is_renderable(cmd_buffer->device, image);
!radv_image_is_renderable(cmd_buffer->device, image);
radv_meta_save(&saved_state, cmd_buffer,
(cs ? RADV_META_SAVE_COMPUTE_PIPELINE :
@@ -473,7 +473,7 @@ copy_image(struct radv_cmd_buffer *cmd_buffer,
assert(src_image->info.samples == dst_image->info.samples);
cs = cmd_buffer->queue_family_index == RADV_QUEUE_COMPUTE ||
!image_is_renderable(cmd_buffer->device, dst_image);
!radv_image_is_renderable(cmd_buffer->device, dst_image);
radv_meta_save(&saved_state, cmd_buffer,
(cs ? RADV_META_SAVE_COMPUTE_PIPELINE :
src/amd/vulkan/radv_private.h
+3
View File
@@ -2118,6 +2118,9 @@ radv_get_levelCount(const struct radv_image *image,
image->info.levels - range->baseMipLevel : range->levelCount;
}
bool
radv_image_is_renderable(struct radv_device *device, struct radv_image *image);
struct radeon_bo_metadata;
void
radv_init_metadata(struct radv_device *device,