From 6c27dbdbc93c8a98ee04ccaae8916c91500b4448 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Wed, 29 Jul 2020 09:49:08 +0200 Subject: [PATCH] v3dv: setup texture shader state correctly for multisampled images Fixes multisampled cases in: dEQP-VK.pipeline.multisample.sampled_image.* Part-of: --- src/broadcom/vulkan/v3dv_image.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/broadcom/vulkan/v3dv_image.c b/src/broadcom/vulkan/v3dv_image.c index fb2da0d4ec8..801d8597da8 100644 --- a/src/broadcom/vulkan/v3dv_image.c +++ b/src/broadcom/vulkan/v3dv_image.c @@ -451,7 +451,10 @@ pack_texture_shader_state_helper(struct v3dv_device *device, assert(image_view->image); const struct v3dv_image *image = image_view->image; - int msaa_scale = 1; /* FIXME: hardcoded. Revisit when msaa get supported */ + assert(image->samples == VK_SAMPLE_COUNT_1_BIT || + image->samples == VK_SAMPLE_COUNT_4_BIT); + const uint32_t msaa_scale = image->samples == VK_SAMPLE_COUNT_1_BIT ? 1 : 2; + v3dv_pack(image_view->texture_shader_state[index], TEXTURE_SHADER_STATE, tex) { tex.level_0_is_strictly_uif =