vulkan: VkPolygonMode has a bit more than two values

Fixes: 9d0ed9cbcc0 ("vulkan: Add more dynamic rasterizer state")

Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20212>
(cherry picked from commit e1ab7629f8a459df87009c7cb28b41acfb17e45c)

diff --git a/.pick_status.json b/.pick_status.json
index 95bc926..6e6095c 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2821,7 +2821,7 @@
         "description": "vulkan: VkPolygonMode has a bit more than two values",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "9d0ed9cbcc01b31a71037fcb35742fc8b77f09fe"
     },

diff --git a/src/vulkan/runtime/vk_graphics_state.c b/src/vulkan/runtime/vk_graphics_state.c
index 2d046df..80889b6 100644 (file)
--- a/src/vulkan/runtime/vk_graphics_state.c
+++ b/src/vulkan/runtime/vk_graphics_state.c
@@ -2012,7 +2012,7 @@ vk_common_CmdSetPolygonModeEXT(VkCommandBuffer commandBuffer,
    VK_FROM_HANDLE(vk_command_buffer, cmd, commandBuffer);
    struct vk_dynamic_graphics_state *dyn = &cmd->dynamic_graphics_state;
 
-   SET_DYN_BOOL(dyn, RS_POLYGON_MODE, rs.polygon_mode, polygonMode);
+   SET_DYN_VALUE(dyn, RS_POLYGON_MODE, rs.polygon_mode, polygonMode);
 }
 
 VKAPI_ATTR void VKAPI_CALL