From 9234bdebed708839f759e4ddda8c25486a76b570 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Tue, 2 Aug 2022 12:27:59 -0400
Subject: [PATCH] zink: use modifier_aspect to check for modifier plane in
 zink_resource_get_param

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17775>
(cherry picked from commit c824a53f352823786967260cfe387a839c28dc9d)
---
 .pick_status.json                        | 2 +-
 src/gallium/drivers/zink/zink_resource.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index f5079dcb260..944ea34493e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -391,7 +391,7 @@
         "description": "zink: use modifier_aspect to check for modifier plane in zink_resource_get_param",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 7421f7ba307..5c20f7b9165 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -1284,7 +1284,7 @@ zink_resource_get_param(struct pipe_screen *pscreen, struct pipe_context *pctx,
    struct zink_resource_object *obj = res->obj;
    struct winsys_handle whandle;
    VkImageAspectFlags aspect;
-   if (res->modifiers) {
+   if (obj->modifier_aspect) {
       switch (plane) {
       case 0:
          aspect = VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT;