From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 13 May 2016 23:52:15 +0000 (-0700)
Subject: anv: Remove the anv_format member from anv_image
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fbc23d93e08165e74ad40915bd3ead68b454d4d3;p=mesa.git

anv: Remove the anv_format member from anv_image
---

diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c
index 2f045f210d0..704ca9f7caf 100644
--- a/src/intel/vulkan/anv_image.c
+++ b/src/intel/vulkan/anv_image.c
@@ -227,7 +227,6 @@ anv_image_create(VkDevice _device,
    image->type = pCreateInfo->imageType;
    image->extent = pCreateInfo->extent;
    image->vk_format = pCreateInfo->format;
-   image->format = format;
    image->aspects = vk_format_aspects(image->vk_format);
    image->levels = pCreateInfo->mipLevels;
    image->array_size = pCreateInfo->arrayLayers;
diff --git a/src/intel/vulkan/anv_meta_resolve.c b/src/intel/vulkan/anv_meta_resolve.c
index 7d2a75bb752..dd2f768577d 100644
--- a/src/intel/vulkan/anv_meta_resolve.c
+++ b/src/intel/vulkan/anv_meta_resolve.c
@@ -717,7 +717,7 @@ void anv_CmdResolveImage(
                .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
                .image = src_image_h,
                .viewType = anv_meta_get_view_type(src_image),
-               .format = src_image->format->vk_format,
+               .format = src_image->vk_format,
                .subresourceRange = {
                   .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
                   .baseMipLevel = region->srcSubresource.mipLevel,
@@ -734,7 +734,7 @@ void anv_CmdResolveImage(
                .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
                .image = dest_image_h,
                .viewType = anv_meta_get_view_type(dest_image),
-               .format = dest_image->format->vk_format,
+               .format = dest_image->vk_format,
                .subresourceRange = {
                   .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
                   .baseMipLevel = region->dstSubresource.mipLevel,
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 6284be92f6d..a00f7d1f541 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -1560,7 +1560,6 @@ struct anv_image {
     * of the actual surface formats.
     */
    VkFormat vk_format;
-   const struct anv_format *format;
    VkImageAspectFlags aspects;
    VkExtent3D extent;
    uint32_t levels;