Mesa (staging/23.3): vulkan: Fix dynamic graphics state enum usage

[GitLab Mirror]

Module: Mesa
Branch: staging/23.3
Commit: be92a7857350265146b5927e1b99748f5afde61a
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=be92a7857350265146b5927e1b99748f5afde61a

Author: George Ouzounoudis <geothr...@gmail.com>
Date:   Thu Aug 24 20:03:02 2023 +0300

vulkan: Fix dynamic graphics state enum usage

Simply replace the correct rasterization stream enum

Fixes: 9d0ed9cbcc01 ("vulkan: Add more dynamic rasterizer state")
Reviewed-by: Faith Ekstrand <faith.ekstr...@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24872>
(cherry picked from commit d8945dd51e47a026b5219b9f9d89fedb4ace04ca)

---

 .pick_status.json                      | 2 +-
 src/vulkan/runtime/vk_graphics_state.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 07735c5930f..621d38f2616 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -124,7 +124,7 @@
         "description": "vulkan: Fix dynamic graphics state enum usage",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "9d0ed9cbcc01b31a71037fcb35742fc8b77f09fe",
         "notes": null
diff --git a/src/vulkan/runtime/vk_graphics_state.c 
b/src/vulkan/runtime/vk_graphics_state.c
index eb526cc1b3a..2a8e210c83e 100644
--- a/src/vulkan/runtime/vk_graphics_state.c
+++ b/src/vulkan/runtime/vk_graphics_state.c
@@ -2338,7 +2338,7 @@ vk_common_CmdSetRasterizationStreamEXT(VkCommandBuffer 
commandBuffer,
    VK_FROM_HANDLE(vk_command_buffer, cmd, commandBuffer);
    struct vk_dynamic_graphics_state *dyn = &cmd->dynamic_graphics_state;
 
-   SET_DYN_VALUE(dyn, RS_PROVOKING_VERTEX,
+   SET_DYN_VALUE(dyn, RS_RASTERIZATION_STREAM,
                  rs.rasterization_stream, rasterizationStream);
 }