summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2019-06-18 16:11:07 +0200
committerDylan Baker <dylan@pnwbakers.com>2019-06-20 10:43:02 -0700
commit41e3639b3aea87ad7ca9e45a94764fd4ccfcae28 (patch)
tree6ffe84b464a0a31b3c98f00873389dce27378b09
parent0eb21e88b033c728edaa7704e4247800764927ab (diff)
downloadmesa-41e3639b3aea87ad7ca9e45a94764fd4ccfcae28.tar.gz
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 <samuel.pitoiset@gmail.com> Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> (cherry picked from commit a7f75377aba6853e08561acb9609c5e262e4d9a6)
-rw-r--r--src/amd/vulkan/radv_meta_fmask_expand.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/amd/vulkan/radv_meta_fmask_expand.c b/src/amd/vulkan/radv_meta_fmask_expand.c
index f4b55328929..425f473fe7f 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)
@@ -132,7 +133,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,