From 423dab9d324e774c807403549c8e67d826af7bd4 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 9 Jun 2017 02:11:29 +0100 Subject: [PATCH] radv: set fmask state to all 0s when no fmask. (v2) The shader reads the descriptor to decide if it should take the fmask value, however we weren't initing it always, which meant random crap, esp with MSAA depth textures. Fixes random hangs with: dEQP-VK.glsl.builtin_var.fragdepth.* v2: check fmask_state is not NULL Fixes: f4e499ec791 "radv: add initial non-conformant radv vulkan driver" Reviewed-by: Bas Nieuwenhuizen Signed-off-by: Dave Airlie (cherry picked from commit 51553c0beaeb91b1f2cb3292ac55573309b1d86f) [Emil Velikov: resolve trivial conflicts] Signed-off-by: Emil Velikov Conflicts: src/amd/vulkan/radv_image.c --- src/amd/vulkan/radv_image.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 3586e4c158b..4e6453cd168 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -382,7 +382,8 @@ si_make_texture_descriptor(struct radv_device *device, S_008F24_LAST_ARRAY(last_layer); fmask_state[6] = 0; fmask_state[7] = 0; - } + } else if (fmask_state) + memset(fmask_state, 0, 8 * 4); } static void