From 15aae04df5e8e91c0cdeb8d7f720d24c82dee0ba Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Tue, 1 Nov 2022 15:34:22 +0100 Subject: [PATCH] hasvk: fix android build and reported API version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit anv_device.c for vulkan.intel_hasvk requires changes to be compiled and behave correctly for android target Fixes the following building error: FAILED: src/intel/vulkan_hasvk/libanv_hasvk_common.a.p/anv_device.c.o ... ../src/intel/vulkan_hasvk/anv_device.c:143:19: error: use of undeclared identifier 'ANV_API_VERSION_1_3' *pApiVersion = ANV_API_VERSION_1_3; ^ ../src/intel/vulkan_hasvk/anv_device.c:1822:44: error: use of undeclared identifier 'ANV_API_VERSION_1_3' .apiVersion = pdevice->use_softpin ? ANV_API_VERSION_1_3 : ANV_API_VERSION_1_2, ^ ../src/intel/vulkan_hasvk/anv_device.c:1822:66: error: use of undeclared identifier 'ANV_API_VERSION_1_2' .apiVersion = pdevice->use_softpin ? ANV_API_VERSION_1_3 : ANV_API_VERSION_1_2, ^ 3 errors generated. Cc: "22.3" mesa-stable Fixes: 00eefdc ("hasvk: stop advertising Vk 1.3 on non-softpin") Reviewed-by: Tapani Pälli Part-of: (cherry picked from commit 814b822fe065ab88409a2833b1c7f331f714b26e) --- .pick_status.json | 2 +- src/intel/vulkan_hasvk/anv_device.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 9bf0bd56dec..5208044482a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1741,7 +1741,7 @@ "description": "hasvk: fix android build and reported API version", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "00eefdcd03c0dcff173439107d7ded490a86ff95" }, diff --git a/src/intel/vulkan_hasvk/anv_device.c b/src/intel/vulkan_hasvk/anv_device.c index c514c020445..ceef6483eec 100644 --- a/src/intel/vulkan_hasvk/anv_device.c +++ b/src/intel/vulkan_hasvk/anv_device.c @@ -140,7 +140,11 @@ compiler_perf_log(UNUSED void *data, UNUSED unsigned *id, const char *fmt, ...) VkResult anv_EnumerateInstanceVersion( uint32_t* pApiVersion) { +#ifdef ANDROID + *pApiVersion = ANV_API_VERSION; +#else *pApiVersion = ANV_API_VERSION_1_3; +#endif return VK_SUCCESS; } @@ -1819,7 +1823,11 @@ void anv_GetPhysicalDeviceProperties( }; *pProperties = (VkPhysicalDeviceProperties) { +#ifdef ANDROID + .apiVersion = ANV_API_VERSION, +#else .apiVersion = pdevice->use_softpin ? ANV_API_VERSION_1_3 : ANV_API_VERSION_1_2, +#endif .driverVersion = vk_get_driver_version(), .vendorID = 0x8086, .deviceID = pdevice->info.pci_device_id,