From 1becf6be4853ec852a561bb1069d5280601fc8d7 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 12 Apr 2023 15:26:24 +0200 Subject: [PATCH] vulkan: ignore rasterizationSamples when the state is dynamic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: 1deb83fb86d ("vulkan: Add more dynamic multisample states") Signed-off-by: Samuel Pitoiset Reviewed-by: Tapani Pälli Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit bdb03ecdd9e9bdd59093d161fb07bffb276bced4) --- .pick_status.json | 2 +- src/vulkan/runtime/vk_graphics_state.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 9810731617d..e33df5a8f19 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -526,7 +526,7 @@ "description": "vulkan: ignore rasterizationSamples when the state is dynamic", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "1deb83fb86d22227a3553f43873b4d4ff9180214" }, diff --git a/src/vulkan/runtime/vk_graphics_state.c b/src/vulkan/runtime/vk_graphics_state.c index d7257132d40..ad2cb7f4248 100644 --- a/src/vulkan/runtime/vk_graphics_state.c +++ b/src/vulkan/runtime/vk_graphics_state.c @@ -660,8 +660,13 @@ vk_multisample_state_init(struct vk_multisample_state *ms, const BITSET_WORD *dynamic, const VkPipelineMultisampleStateCreateInfo *ms_info) { - assert(ms_info->rasterizationSamples <= MESA_VK_MAX_SAMPLES); - ms->rasterization_samples = ms_info->rasterizationSamples; + if (IS_DYNAMIC(MS_RASTERIZATION_SAMPLES)) { + ms->rasterization_samples = 0; + } else { + assert(ms_info->rasterizationSamples <= MESA_VK_MAX_SAMPLES); + ms->rasterization_samples = ms_info->rasterizationSamples; + } + ms->sample_shading_enable = ms_info->sampleShadingEnable; ms->min_sample_shading = ms_info->minSampleShading;