Mesa (main): anv: drop from_wsi bit from anv_image

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Apr 7 19:20:52 UTC 2022


Module: Mesa
Branch: main
Commit: 0666b7fecc068d297bf62600519bc6c8ed14b208
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0666b7fecc068d297bf62600519bc6c8ed14b208

Author: Benjamin Cheng <ben at bcheng.me>
Date:   Thu Apr  7 12:56:49 2022 -0400

anv: drop from_wsi bit from anv_image

It was originally introduced in ca791f5c but it was never actually set
anywhere. It doesn't serve any purpose other than some sanity checking
so let's clean it up for now.

Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15799>

---

 src/intel/vulkan/anv_image.c   | 1 -
 src/intel/vulkan/anv_private.h | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c
index fe99cfcfd87..7422ccdaf9e 100644
--- a/src/intel/vulkan/anv_image.c
+++ b/src/intel/vulkan/anv_image.c
@@ -919,7 +919,6 @@ check_memory_bindings(const struct anv_device *device,
        * live in a VkDeviceMemory.  The one exception is swapchain images.
        */
       assert(!(image->vk.create_flags & VK_IMAGE_CREATE_ALIAS_BIT) ||
-             image->from_wsi ||
              image->bindings[ANV_IMAGE_MEMORY_BINDING_PRIVATE].memory_range.size == 0);
 
       /* Check primary surface */
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 412c9e430ce..b13ef5124af 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -3829,11 +3829,6 @@ struct anv_image {
     */
    bool disjoint;
 
-   /**
-    * Image is a WSI image
-    */
-   bool from_wsi;
-
    /**
     * Image was imported from an struct AHardwareBuffer.  We have to delay
     * final image creation until bind time.



More information about the mesa-commit mailing list