Module: Mesa Branch: main Commit: 342dba5102b16e31c1a4de5067fab2d9bfea53ca URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=342dba5102b16e31c1a4de5067fab2d9bfea53ca
Author: Chris Spencer <spence...@gmail.com> Date: Thu Sep 7 19:08:22 2023 +0100 vulkan/android: Only limit advertised extensions 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/virtio/vulkan/vn_physical_device.c | 2 +- src/vulkan/runtime/vk_device.c | 2 +- src/vulkan/runtime/vk_instance.c | 4 ++-- src/vulkan/runtime/vk_physical_device.c | 2 +- src/vulkan/util/vk_extensions_gen.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/virtio/vulkan/vn_physical_device.c b/src/virtio/vulkan/vn_physical_device.c index 38913aa3475..6fa5e543bae 100644 --- a/src/virtio/vulkan/vn_physical_device.c +++ b/src/virtio/vulkan/vn_physical_device.c @@ -1194,7 +1194,7 @@ vn_physical_device_init_supported_extensions( for (uint32_t i = 0; i < VK_DEVICE_EXTENSION_COUNT; i++) { const VkExtensionProperties *props = &vk_device_extensions[i]; -#ifdef ANDROID +#ifdef ANDROID_STRICT if (!vk_android_allowed_device_extensions.extensions[i]) continue; #endif diff --git a/src/vulkan/runtime/vk_device.c b/src/vulkan/runtime/vk_device.c index b48feca2c71..38d2bb6e7a5 100644 --- a/src/vulkan/runtime/vk_device.c +++ b/src/vulkan/runtime/vk_device.c @@ -127,7 +127,7 @@ vk_device_init(struct vk_device *device, "%s not supported", pCreateInfo->ppEnabledExtensionNames[i]); -#ifdef ANDROID +#ifdef ANDROID_STRICT if (!vk_android_allowed_device_extensions.extensions[idx]) return vk_errorf(physical_device, VK_ERROR_EXTENSION_NOT_PRESENT, "%s not supported", diff --git a/src/vulkan/runtime/vk_instance.c b/src/vulkan/runtime/vk_instance.c index 0f6796ebb3d..68a4e43364b 100644 --- a/src/vulkan/runtime/vk_instance.c +++ b/src/vulkan/runtime/vk_instance.c @@ -161,7 +161,7 @@ vk_instance_init(struct vk_instance *instance, "%s not supported", pCreateInfo->ppEnabledExtensionNames[i]); -#ifdef ANDROID +#ifdef ANDROID_STRICT if (!vk_android_allowed_instance_extensions.extensions[idx]) return vk_errorf(instance, VK_ERROR_EXTENSION_NOT_PRESENT, "%s not supported", @@ -259,7 +259,7 @@ vk_enumerate_instance_extension_properties( if (!supported_extensions->extensions[i]) continue; -#ifdef ANDROID +#ifdef ANDROID_STRICT if (!vk_android_allowed_instance_extensions.extensions[i]) continue; #endif diff --git a/src/vulkan/runtime/vk_physical_device.c b/src/vulkan/runtime/vk_physical_device.c index 188449f8c50..c524ee313da 100644 --- a/src/vulkan/runtime/vk_physical_device.c +++ b/src/vulkan/runtime/vk_physical_device.c @@ -92,7 +92,7 @@ vk_common_EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, if (!pdevice->supported_extensions.extensions[i]) continue; -#ifdef ANDROID +#ifdef ANDROID_STRICT if (!vk_android_allowed_device_extensions.extensions[i]) continue; #endif diff --git a/src/vulkan/util/vk_extensions_gen.py b/src/vulkan/util/vk_extensions_gen.py index da445861bec..e6f614d354d 100644 --- a/src/vulkan/util/vk_extensions_gen.py +++ b/src/vulkan/util/vk_extensions_gen.py @@ -75,7 +75,7 @@ ${extension_table('device', device_extensions)} struct ${driver}_physical_device; %if driver == 'vk': -#ifdef ANDROID +#ifdef ANDROID_STRICT extern const struct vk_instance_extension_table vk_android_allowed_instance_extensions; extern const struct vk_device_extension_table vk_android_allowed_device_extensions; #endif @@ -111,7 +111,7 @@ const VkExtensionProperties ${driver}_device_extensions[${driver.upper()}_DEVICE %endfor }; -#ifdef ANDROID +#ifdef ANDROID_STRICT const struct vk_instance_extension_table vk_android_allowed_instance_extensions = { %for ext in instance_extensions: .${ext.name[3:]} = ${ext.c_android_condition()},
