Mesa (staging/19.1): radv: fix FMASK expand with SRGB formats
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jun 20 08:57:10 UTC 2019
Module: Mesa
Branch: staging/19.1
Commit: 3fdf2b9645aa3751c51862c7f7df617fc61f9fd4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3fdf2b9645aa3751c51862c7f7df617fc61f9fd4
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Tue Jun 18 16:11:07 2019 +0200
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 at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
(cherry picked from commit a7f75377aba6853e08561acb9609c5e262e4d9a6)
---
src/amd/vulkan/radv_meta_fmask_expand.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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,
More information about the mesa-commit
mailing list