From: Samuel Pitoiset Date: Tue, 18 Jun 2019 14:11:07 +0000 (+0200) Subject: radv: fix FMASK expand with SRGB formats X-Git-Tag: upstream/19.3.0~5348 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7f75377aba6853e08561acb9609c5e262e4d9a6;p=platform%2Fupstream%2Fmesa.git radv: fix FMASK expand with SRGB formats Found while working on DCC for MSAA. Fixes: 6b976024a87 ("radv: add support for FMASK expand") Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- diff --git a/src/amd/vulkan/radv_meta_fmask_expand.c b/src/amd/vulkan/radv_meta_fmask_expand.c index a9567ea..e5d0868 100644 --- a/src/amd/vulkan/radv_meta_fmask_expand.c +++ b/src/amd/vulkan/radv_meta_fmask_expand.c @@ -24,6 +24,7 @@ #include "radv_meta.h" #include "radv_private.h" +#include "vk_format.h" static nir_shader * build_fmask_expand_compute_shader(struct radv_device *device, int samples) @@ -130,7 +131,7 @@ radv_expand_fmask_image_inplace(struct radv_cmd_buffer *cmd_buffer, .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, .image = radv_image_to_handle(image), .viewType = radv_meta_get_view_type(image), - .format = image->vk_format, + .format = vk_format_no_srgb(image->vk_format), .subresourceRange = { .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, .baseMipLevel = 0,