summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIván Briano <ivan.briano@intel.com>2022-12-07 12:30:36 -0800
committerEric Engestrom <eric@engestrom.ch>2022-12-14 20:47:01 +0000
commit75e55ca05a0c67c4f9785f453563c281a5251d1d (patch)
treeca6090c8ae909b698de808982e37d6aa05bd8251
parentd4d1f522842760db571d8edd72bca21990a46638 (diff)
downloadmesa-75e55ca05a0c67c4f9785f453563c281a5251d1d.tar.gz
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)
-rw-r--r--.pick_status.json2
-rw-r--r--src/vulkan/runtime/vk_graphics_state.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 95bc926729a..6e6095cd912 100644
--- 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 2d046dfe330..80889b6ede0 100644
--- 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