From cf8997ab585f9ae7821ffd7072535ea2c16d7058 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 30 Jun 2021 09:32:19 -0400
Subject: [PATCH] zink: store some image creation metadata to object struct

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12661>
---
 src/gallium/drivers/zink/zink_resource.c | 3 +++
 src/gallium/drivers/zink/zink_resource.h | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 90d0e5edd38..bb242993c04 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -554,6 +554,9 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t
         flags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
       else
         flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+
+      obj->vkflags = ici.flags;
+      obj->vkusage = ici.usage;
    }
    obj->alignment = reqs.alignment;
 
diff --git a/src/gallium/drivers/zink/zink_resource.h b/src/gallium/drivers/zink/zink_resource.h
index 3b91404abcc..626d1ca3133 100644
--- a/src/gallium/drivers/zink/zink_resource.h
+++ b/src/gallium/drivers/zink/zink_resource.h
@@ -78,6 +78,8 @@ struct zink_resource_object {
 
    struct zink_bo *bo;
    VkDeviceSize offset, size, alignment;
+   VkImageCreateFlags vkflags;
+   VkImageUsageFlags vkusage;
 
    bool host_visible;
    bool coherent;