From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 13 Oct 2015 22:20:28 +0000 (-0700)
Subject: anv/formats: Use the surface_format_info struct from brw_surface_formats.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=28ed02588a6204fc3272de84dab009b5bb19e07d;p=mesa.git

anv/formats: Use the surface_format_info struct from brw_surface_formats.h

The surface_format_info struct changed in mesa but the copied-and-pasted
version didn't get updated on the last mesa master merge.  This both fixes
the bug and should prevent this in the future.
---

diff --git a/src/vulkan/anv_formats.c b/src/vulkan/anv_formats.c
index 2690ff24692..4efc537676c 100644
--- a/src/vulkan/anv_formats.c
+++ b/src/vulkan/anv_formats.c
@@ -22,6 +22,7 @@
  */
 
 #include "anv_private.h"
+#include "brw_surface_formats.h"
 
 #define UNSUPPORTED 0xffff
 
@@ -220,21 +221,6 @@ anv_format_for_vk_format(VkFormat format)
 
 // Format capabilities
 
-struct surface_format_info {
-   bool exists;
-   int sampling;
-   int filtering;
-   int shadow_compare;
-   int chroma_key;
-   int render_target;
-   int alpha_blend;
-   int input_vb;
-   int streamed_output_vb;
-   int color_processing;
-};
-
-extern const struct surface_format_info surface_formats[];
-
 VkResult anv_validate_GetPhysicalDeviceFormatProperties(
     VkPhysicalDevice                            physicalDevice,
     VkFormat                                    _format,
@@ -250,7 +236,7 @@ anv_physical_device_get_format_properties(struct anv_physical_device *physical_d
                                           const struct anv_format *format,
                                           VkFormatProperties *out_properties)
 {
-   const struct surface_format_info *info;
+   const struct brw_surface_format_info *info;
    int gen;
    VkFormatFeatureFlags flags;