diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2021-10-20 09:23:26 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2021-10-27 19:58:08 +0100 |
| commit | 2ac3a3b5e9845c7214774bb2d3e23d0efff366ec (patch) | |
| tree | 2ac489e415129bf515531906ce4bddfbb17df7b4 | |
| parent | 40eb47924e75dd331ea732df2f5258ad35f10916 (diff) | |
| download | mesa-2ac3a3b5e9845c7214774bb2d3e23d0efff366ec.tar.gz | |
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@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13450>
(cherry picked from commit 4765edb4e02efa57cd39b1718624721f6545e9a5)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | 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 be0579142f0..271d50ba633 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -598,7 +598,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; |