Mesa (staging/22.1): zink: avoid uninit values in renderpass state

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: 50b548d4d4cbbe9df197400acf3b7bfcfab5ffb6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=50b548d4d4cbbe9df197400acf3b7bfcfab5ffb6

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Jun 13 15:05:09 2022 -0400

zink: avoid uninit values in renderpass state

cc: mesa-stable

Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17010>
(cherry picked from commit d8877437d6125c63b4bfe0b048981770f25a9d16)

---

 .pick_status.json                           |  2 +-
 src/gallium/drivers/zink/zink_render_pass.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index adb1922e9bf..ab5e8a6213f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1165,7 +1165,7 @@
         "description": "zink: avoid uninit values in renderpass state",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_render_pass.c b/src/gallium/drivers/zink/zink_render_pass.c
index f0f8ab1ba66..84aa1a7329e 100644
--- a/src/gallium/drivers/zink/zink_render_pass.c
+++ b/src/gallium/drivers/zink/zink_render_pass.c
@@ -162,6 +162,7 @@ create_render_pass2(struct zink_screen *screen, struct zink_render_pass_state *s
    pstate->num_attachments = state->num_cbufs;
    pstate->num_cresolves = state->num_cresolves;
    pstate->num_zsresolves = state->num_zsresolves;
+   pstate->fbfetch = 0;
    for (int i = 0; i < state->num_cbufs; i++) {
       struct zink_rt_attrib *rt = state->rts + i;
       attachments[i].sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2;
@@ -267,12 +268,9 @@ create_render_pass2(struct zink_screen *screen, struct zink_render_pass_state *s
       }
       pstate->num_attachments++;
    }
-   if (dep_access & VK_ACCESS_COLOR_ATTACHMENT_READ_BIT)
-      pstate->color_read = true;
-   if (dep_access & VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT)
-      pstate->depth_read = true;
-   if (dep_access & VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT)
-      pstate->depth_write = true;
+   pstate->color_read = (dep_access & VK_ACCESS_COLOR_ATTACHMENT_READ_BIT) > 0;
+   pstate->depth_read = (dep_access & VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT) > 0;
+   pstate->depth_write = (dep_access & VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT) > 0;
 
    if (!screen->info.have_KHR_synchronization2)
       dep_pipeline = MAX2(dep_pipeline, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT);