Mesa (staging/22.0): anv: fix some dynamic rasterization discard cases in pipeline construction

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Mar  7 20:20:11 2022 -0500

anv: fix some dynamic rasterization discard cases in pipeline construction

cc: mesa-stable

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15280>
(cherry picked from commit 5ab0e3f0bb09bde3d06b0ea448a6e183a813e286)

---

 .pick_status.json               | 2 +-
 src/intel/vulkan/anv_pipeline.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 9855d544d8b..84871467975 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -652,7 +652,7 @@
         "description": "anv: fix some dynamic rasterization discard cases in pipeline construction",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 0c4abb8339f..94774e82cdd 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -2421,8 +2421,7 @@ copy_non_dynamic_state(struct anv_graphics_pipeline *pipeline,
    }
 
    const VkPipelineMultisampleStateCreateInfo *ms_info =
-      pCreateInfo->pRasterizationState->rasterizerDiscardEnable ? NULL :
-      pCreateInfo->pMultisampleState;
+      raster_discard ? NULL : pCreateInfo->pMultisampleState;
    if (states & ANV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS) {
       const VkPipelineSampleLocationsStateCreateInfoEXT *sl_info = ms_info ?
          vk_find_struct_const(ms_info, PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT) : NULL;
@@ -2452,8 +2451,7 @@ copy_non_dynamic_state(struct anv_graphics_pipeline *pipeline,
    }
 
    if (states & ANV_CMD_DIRTY_DYNAMIC_COLOR_BLEND_STATE) {
-      if (!pCreateInfo->pRasterizationState->rasterizerDiscardEnable &&
-          uses_color_att) {
+      if (!raster_discard && uses_color_att) {
          assert(pCreateInfo->pColorBlendState);
          const VkPipelineColorWriteCreateInfoEXT *color_write_info =
             vk_find_struct_const(pCreateInfo->pColorBlendState->pNext,