Mesa (staging/21.3): radv: fix build errors with Android

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 06f19a05065d836e913d69a6bd9b391544d33310
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=06f19a05065d836e913d69a6bd9b391544d33310

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Oct 20 09:23:26 2021 +0200

radv: fix build errors with Android

Fixes: 49c3a88fadd ("radv: implement VK_KHR_format_feature_flags2")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5518
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13450>
(cherry picked from commit 4765edb4e02efa57cd39b1718624721f6545e9a5)

---

 .pick_status.json             | 2 +-
 src/amd/vulkan/radv_android.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index b3573a1ed06..4e8c787513c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -31,7 +31,7 @@
         "description": "radv: fix build errors with Android",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "49c3a88fadd03af0954986a0bafde66b01940ed4"
     },
diff --git a/src/amd/vulkan/radv_android.c b/src/amd/vulkan/radv_android.c
index dcfdfe3b80c..790e2c57508 100644
--- a/src/amd/vulkan/radv_android.c
+++ b/src/amd/vulkan/radv_android.c
@@ -662,7 +662,7 @@ get_ahb_buffer_format_properties(VkDevice device_h, const struct AHardwareBuffer
 
 static VkResult
 get_ahb_buffer_format_properties2(VkDevice device_h, const struct AHardwareBuffer *buffer,
-                                  VkAndroidHardwareBufferFormatPropertiesANDROID2 *pProperties)
+                                  VkAndroidHardwareBufferFormatProperties2ANDROID *pProperties)
 {
    RADV_FROM_HANDLE(radv_device, device, device_h);
 
@@ -682,7 +682,7 @@ get_ahb_buffer_format_properties2(VkDevice device_h, const struct AHardwareBuffe
       return VK_ERROR_INVALID_EXTERNAL_HANDLE;
 
    /* Fill properties fields based on description. */
-   VkAndroidHardwareBufferFormatPropertiesANDROID *p = pProperties;
+   VkAndroidHardwareBufferFormatProperties2ANDROID *p = pProperties;
 
    p->format = vk_format_from_android(desc.format, desc.usage);
    p->externalFormat = (uint64_t)(uintptr_t)p->format;