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

radv: fix DCC fast clear code for intensity formats

Browse source 
This fixes a rendering issue with DiRT 4 on GFX10. Only GFX10 was
affected because intensity formats are different.

Cc: 19.2 <mesa-stable@lists.freedesktop.org>
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1923
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Samuel Pitoiset 2019-10-11 17:40:59 +02:00
parent ebe176eeff
commit ea92273cea
3 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -715,7 +715,7 @@ static unsigned gfx9_border_color_swizzle(const enum vk_swizzle swizzle[4])
return bc_swizzle; return bc_swizzle;
} }
static bool vi_alpha_is_on_msb(struct radv_device *device, VkFormat format) bool vi_alpha_is_on_msb(struct radv_device *device, VkFormat format)
{ {
const struct vk_format_description *desc = vk_format_description(format); const struct vk_format_description *desc = vk_format_description(format);

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

@ -1450,7 +1450,9 @@ enum {
RADV_DCC_CLEAR_SECONDARY_1 = 0x40404040U RADV_DCC_CLEAR_SECONDARY_1 = 0x40404040U
}; };
static void vi_get_fast_clear_parameters(VkFormat format, static void vi_get_fast_clear_parameters(struct radv_device *device,
VkFormat image_format,
VkFormat view_format,
const VkClearColorValue *clear_value, const VkClearColorValue *clear_value,
uint32_t* reset_value, uint32_t* reset_value,
bool *can_avoid_fast_clear_elim) bool *can_avoid_fast_clear_elim)
@ -1464,19 +1466,22 @@ static void vi_get_fast_clear_parameters(VkFormat format,
*reset_value = RADV_DCC_CLEAR_REG; *reset_value = RADV_DCC_CLEAR_REG;
const struct vk_format_description *desc = vk_format_description(format); const struct vk_format_description *desc = vk_format_description(view_format);
if (format == VK_FORMAT_B10G11R11_UFLOAT_PACK32 || if (view_format == VK_FORMAT_B10G11R11_UFLOAT_PACK32 ||
format == VK_FORMAT_R5G6B5_UNORM_PACK16 || view_format == VK_FORMAT_R5G6B5_UNORM_PACK16 ||
format == VK_FORMAT_B5G6R5_UNORM_PACK16) view_format == VK_FORMAT_B5G6R5_UNORM_PACK16)
extra_channel = -1; extra_channel = -1;
else if (desc->layout == VK_FORMAT_LAYOUT_PLAIN) { else if (desc->layout == VK_FORMAT_LAYOUT_PLAIN) {
if (radv_translate_colorswap(format, false) <= 1) if (vi_alpha_is_on_msb(device, view_format))
extra_channel = desc->nr_channels - 1; extra_channel = desc->nr_channels - 1;
else else
extra_channel = 0; extra_channel = 0;
} else } else
return; return;
bool image_alpha_is_on_msb = vi_alpha_is_on_msb(device, image_format);
bool view_alpha_is_on_msb = vi_alpha_is_on_msb(device, view_format);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
int index = desc->swizzle[i] - VK_SWIZZLE_X; int index = desc->swizzle[i] - VK_SWIZZLE_X;
if (desc->swizzle[i] < VK_SWIZZLE_X || if (desc->swizzle[i] < VK_SWIZZLE_X ||
@ -1511,6 +1516,17 @@ static void vi_get_fast_clear_parameters(VkFormat format,
main_value = values[i]; main_value = values[i];
} }
/* If alpha isn't present, make it the same as color, and vice versa. */
if (!extra_value)
extra_value = main_value;
else if (!main_value)
main_value = extra_value;
if (main_value != extra_value) {
assert(image_alpha_is_on_msb == view_alpha_is_on_msb);
return; /* require ELIMINATE_FAST_CLEAR */
}
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
if (values[i] != main_value && if (values[i] != main_value &&
desc->swizzle[i] - VK_SWIZZLE_X != extra_channel && desc->swizzle[i] - VK_SWIZZLE_X != extra_channel &&
@ -1570,7 +1586,9 @@ radv_can_fast_clear_color(struct radv_cmd_buffer *cmd_buffer,
bool can_avoid_fast_clear_elim; bool can_avoid_fast_clear_elim;
uint32_t reset_value; uint32_t reset_value;
vi_get_fast_clear_parameters(iview->vk_format, vi_get_fast_clear_parameters(cmd_buffer->device,
iview->image->vk_format,
iview->vk_format,
&clear_value, &reset_value, &clear_value, &reset_value,
&can_avoid_fast_clear_elim); &can_avoid_fast_clear_elim);
@ -1642,7 +1660,9 @@ radv_fast_clear_color(struct radv_cmd_buffer *cmd_buffer,
bool can_avoid_fast_clear_elim; bool can_avoid_fast_clear_elim;
bool need_decompress_pass = false; bool need_decompress_pass = false;
vi_get_fast_clear_parameters(iview->vk_format, vi_get_fast_clear_parameters(cmd_buffer->device,
iview->image->vk_format,
iview->vk_format,
&clear_value, &reset_value, &clear_value, &reset_value,
&can_avoid_fast_clear_elim); &can_avoid_fast_clear_elim);

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

@ -1924,6 +1924,8 @@ VkResult radv_image_create(VkDevice _device,
const VkAllocationCallbacks* alloc, const VkAllocationCallbacks* alloc,
VkImage *pImage); VkImage *pImage);
bool vi_alpha_is_on_msb(struct radv_device *device, VkFormat format);
VkResult VkResult
radv_image_from_gralloc(VkDevice device_h, radv_image_from_gralloc(VkDevice device_h,
const VkImageCreateInfo *base_info, const VkImageCreateInfo *base_info,