diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2022-08-02 12:27:59 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-08-11 10:30:37 -0700 |
| commit | ab46774ae5bc8c2c604f6c1b6d062d820b9b490b (patch) | |
| tree | 7dba262a2abf85a4fbfbc7309569a2c0b6f5384b | |
| parent | bab4564993a267f58c785401b2ef9daeb4d15cfa (diff) | |
| download | mesa-ab46774ae5bc8c2c604f6c1b6d062d820b9b490b.tar.gz | |
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)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | 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 54d2ca67dd2..3e166a62270 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2092,7 +2092,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 406320ff413..91bd8693628 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -1197,7 +1197,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; |