From 6d080b3e824329cf36271da6c9a8cadf54864082 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 10 Aug 2023 09:16:34 +0200
Subject: [PATCH] vulkan: ignore VkPipelineColorWriteCreateInfoEXT if the state
 is dynamic

Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24601>
(cherry picked from commit ce0c70fb0c696d311e624fadc3890dad0534d8c5)
---
 .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 b2524ee2d35..90ac4a786f5 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -7354,7 +7354,7 @@
         "description": "vulkan: ignore VkPipelineColorWriteCreateInfoEXT if the state is dynamic",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/vulkan/runtime/vk_graphics_state.c b/src/vulkan/runtime/vk_graphics_state.c
index 04114fe3362..22935ffd8a2 100644
--- a/src/vulkan/runtime/vk_graphics_state.c
+++ b/src/vulkan/runtime/vk_graphics_state.c
@@ -983,7 +983,7 @@ vk_color_blend_state_init(struct vk_color_blend_state *cb,
 
    const VkPipelineColorWriteCreateInfoEXT *cw_info =
       vk_find_struct_const(cb_info->pNext, PIPELINE_COLOR_WRITE_CREATE_INFO_EXT);
-   if (cw_info != NULL) {
+   if (!IS_DYNAMIC(CB_COLOR_WRITE_ENABLES) && cw_info != NULL) {
       uint8_t color_write_enables = 0;
       assert(cb_info->attachmentCount == cw_info->attachmentCount);
       for (uint32_t a = 0; a < cw_info->attachmentCount; a++) {