From 237c9caa78a125286b24356e4d728d583d429fd8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Mon, 5 Mar 2018 18:46:20 +0200 Subject: [PATCH] vulkan: do not expose surface/swapchain extensions on Android MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit On Android surface/swapchain extensions are implemented by the loader. Patch modifies both anv and radv extension scripts disabling currently exposed ones. See also earlier commit 9f763c1f9b. Signed-off-by: Tapani Pälli Reviewed-by: Jason Ekstrand --- src/amd/vulkan/radv_extensions.py | 4 ++-- src/intel/vulkan/anv_extensions.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py index 92b1ea3e142..6a323ea9b0b 100644 --- a/src/amd/vulkan/radv_extensions.py +++ b/src/amd/vulkan/radv_extensions.py @@ -65,9 +65,9 @@ EXTENSIONS = [ Extension('VK_KHR_external_semaphore_fd', 1, 'device->rad_info.has_syncobj'), Extension('VK_KHR_get_memory_requirements2', 1, True), Extension('VK_KHR_get_physical_device_properties2', 1, True), - Extension('VK_KHR_get_surface_capabilities2', 1, True), + Extension('VK_KHR_get_surface_capabilities2', 1, 'RADV_HAS_SURFACE'), Extension('VK_KHR_image_format_list', 1, True), - Extension('VK_KHR_incremental_present', 1, True), + Extension('VK_KHR_incremental_present', 1, 'RADV_HAS_SURFACE'), Extension('VK_KHR_maintenance1', 1, True), Extension('VK_KHR_maintenance2', 1, True), Extension('VK_KHR_push_descriptor', 1, True), diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py index fd0d3337d08..676efa43429 100644 --- a/src/intel/vulkan/anv_extensions.py +++ b/src/intel/vulkan/anv_extensions.py @@ -68,7 +68,7 @@ EXTENSIONS = [ Extension('VK_KHR_get_physical_device_properties2', 1, True), Extension('VK_KHR_get_surface_capabilities2', 1, 'ANV_HAS_SURFACE'), Extension('VK_KHR_image_format_list', 1, True), - Extension('VK_KHR_incremental_present', 1, True), + Extension('VK_KHR_incremental_present', 1, 'ANV_HAS_SURFACE'), Extension('VK_KHR_maintenance1', 1, True), Extension('VK_KHR_maintenance2', 1, True), Extension('VK_KHR_push_descriptor', 1, True), -- 2.30.2