From: Chad Versace <chadversary@chromium.org>
Date: Fri, 3 Nov 2017 23:35:12 +0000 (-0700)
Subject: anv: Remove anv_physical_device_get_format_properties()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3ee7f4bc2f56f7c9c23de52fbe77125deef6be86;p=mesa.git

anv: Remove anv_physical_device_get_format_properties()

Fold its body into its sole caller,
anv_GetPhysicalDeviceFormatProperties().

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---

diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index d662e336d88..25d34fcadc1 100644
--- a/src/intel/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
@@ -651,35 +651,25 @@ get_buffer_format_features(const struct gen_device_info *devinfo,
    return flags;
 }
 
-static void
-anv_physical_device_get_format_properties(struct anv_physical_device *physical_device,
-                                          VkFormat vk_format,
-                                          VkFormatProperties *out_properties)
-{
-   const struct gen_device_info *devinfo = &physical_device->info;
-   const struct anv_format *anv_format = anv_get_format(vk_format);
-
-   out_properties->linearTilingFeatures =
-      get_image_format_features(devinfo, vk_format, anv_format,
-                                VK_IMAGE_TILING_LINEAR);
-   out_properties->optimalTilingFeatures =
-      get_image_format_features(devinfo, vk_format, anv_format,
-                                VK_IMAGE_TILING_OPTIMAL);
-   out_properties->bufferFeatures =
-      get_buffer_format_features(devinfo, vk_format, anv_format);
-}
-
 void anv_GetPhysicalDeviceFormatProperties(
     VkPhysicalDevice                            physicalDevice,
-    VkFormat                                    format,
+    VkFormat                                    vk_format,
     VkFormatProperties*                         pFormatProperties)
 {
    ANV_FROM_HANDLE(anv_physical_device, physical_device, physicalDevice);
+   const struct gen_device_info *devinfo = &physical_device->info;
+   const struct anv_format *anv_format = anv_get_format(vk_format);
 
-   anv_physical_device_get_format_properties(
-               physical_device,
-               format,
-               pFormatProperties);
+   *pFormatProperties = (VkFormatProperties) {
+      .linearTilingFeatures =
+         get_image_format_features(devinfo, vk_format, anv_format,
+                                   VK_IMAGE_TILING_LINEAR),
+      .optimalTilingFeatures =
+         get_image_format_features(devinfo, vk_format, anv_format,
+                                   VK_IMAGE_TILING_OPTIMAL),
+      .bufferFeatures =
+         get_buffer_format_features(devinfo, vk_format, anv_format),
+   };
 }
 
 void anv_GetPhysicalDeviceFormatProperties2KHR(