Module: Mesa Branch: main Commit: ebc30322450c68d9d7c03e9dde92be2548e87680 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ebc30322450c68d9d7c03e9dde92be2548e87680
Author: Chris Spencer <spence...@gmail.com> Date: Thu Sep 7 19:08:09 2023 +0100 anv/android: Only limit advertised Vulkan version in strict mode Signed-off-by: Chris Spencer <spence...@gmail.com> Acked-by: Chia-I Wu <olva...@gmail.com> Acked-by: Yiwei Zhang <zzyi...@chromium.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25101> --- src/intel/vulkan/anv_device.c | 2 +- src/intel/vulkan_hasvk/anv_device.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index fc603fd0f37..27b246db747 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -156,7 +156,7 @@ compiler_perf_log(UNUSED void *data, UNUSED unsigned *id, const char *fmt, ...) #define ANV_USE_WSI_PLATFORM #endif -#ifdef ANDROID +#ifdef ANDROID_STRICT #if ANDROID_API_LEVEL >= 33 #define ANV_API_VERSION VK_MAKE_VERSION(1, 3, VK_HEADER_VERSION) #else diff --git a/src/intel/vulkan_hasvk/anv_device.c b/src/intel/vulkan_hasvk/anv_device.c index 0fb683003ee..e7ce9513bf4 100644 --- a/src/intel/vulkan_hasvk/anv_device.c +++ b/src/intel/vulkan_hasvk/anv_device.c @@ -132,7 +132,7 @@ compiler_perf_log(UNUSED void *data, UNUSED unsigned *id, const char *fmt, ...) #define ANV_USE_WSI_PLATFORM #endif -#ifdef ANDROID +#ifdef ANDROID_STRICT #define ANV_API_VERSION VK_MAKE_VERSION(1, 1, VK_HEADER_VERSION) #else #define ANV_API_VERSION_1_3 VK_MAKE_VERSION(1, 3, VK_HEADER_VERSION) @@ -142,7 +142,7 @@ compiler_perf_log(UNUSED void *data, UNUSED unsigned *id, const char *fmt, ...) VkResult anv_EnumerateInstanceVersion( uint32_t* pApiVersion) { -#ifdef ANDROID +#ifdef ANDROID_STRICT *pApiVersion = ANV_API_VERSION; #else *pApiVersion = ANV_API_VERSION_1_3; @@ -1571,7 +1571,7 @@ void anv_GetPhysicalDeviceProperties( }; *pProperties = (VkPhysicalDeviceProperties) { -#ifdef ANDROID +#ifdef ANDROID_STRICT .apiVersion = ANV_API_VERSION, #else .apiVersion = (pdevice->use_softpin || pdevice->instance->report_vk_1_3) ?
