OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv/android: Disable surface and swapchain extensions (v2)

Browse Source 
Android's Vulkan loader implements VK_KHR_surface and VK_KHR_swapchain,
and applications cannot access the driver's implementation. Moreoever,
if the driver exposes the those extension strings, then tests
dEQP-VK.api.info.instance.extensions and dEQP-VK.api.info.device fail
due to the duplicated strings.

v2: Replace !ANDROID with ANV_HAS_SURFACE. (for jekstrand)

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Tested-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Chad Versace
2017-09-01 15:54:38 -07:00
parent 39c9d43536
commit 9f763c1f9b
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/intel/vulkan/anv_extensions.py
View File

@@ -44,6 +44,11 @@ class Extension:
else: else:
self.enable = enable; self.enable = enable;
# On Android, we disable all surface and swapchain extensions. Android's Vulkan
# loader implements VK_KHR_surface and VK_KHR_swapchain, and applications
# cannot access the driver's implementation. Moreoever, if the driver exposes
# the those extension strings, then tests dEQP-VK.api.info.instance.extensions
# and dEQP-VK.api.info.device fail due to the duplicated strings.
EXTENSIONS = [ EXTENSIONS = [
Extension('VK_KHR_bind_memory2', 1, True), Extension('VK_KHR_bind_memory2', 1, True),
Extension('VK_KHR_dedicated_allocation', 1, True), Extension('VK_KHR_dedicated_allocation', 1, True),
@@ -61,7 +66,7 @@ EXTENSIONS = [
Extension('VK_KHR_external_semaphore_fd', 1, True), Extension('VK_KHR_external_semaphore_fd', 1, True),
Extension('VK_KHR_get_memory_requirements2', 1, True), Extension('VK_KHR_get_memory_requirements2', 1, True),
Extension('VK_KHR_get_physical_device_properties2', 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, 'ANV_HAS_SURFACE'),
Extension('VK_KHR_image_format_list', 1, True), Extension('VK_KHR_image_format_list', 1, True),
Extension('VK_KHR_incremental_present', 1, True), Extension('VK_KHR_incremental_present', 1, True),
Extension('VK_KHR_maintenance1', 1, True), Extension('VK_KHR_maintenance1', 1, True),
@@ -70,8 +75,8 @@ EXTENSIONS = [
Extension('VK_KHR_sampler_mirror_clamp_to_edge', 1, True), Extension('VK_KHR_sampler_mirror_clamp_to_edge', 1, True),
Extension('VK_KHR_shader_draw_parameters', 1, True), Extension('VK_KHR_shader_draw_parameters', 1, True),
Extension('VK_KHR_storage_buffer_storage_class', 1, True), Extension('VK_KHR_storage_buffer_storage_class', 1, True),
Extension('VK_KHR_surface', 25, True), Extension('VK_KHR_surface', 25, 'ANV_HAS_SURFACE'),
Extension('VK_KHR_swapchain', 68, True), Extension('VK_KHR_swapchain', 68, 'ANV_HAS_SURFACE'),
Extension('VK_KHR_variable_pointers', 1, True), Extension('VK_KHR_variable_pointers', 1, True),
Extension('VK_KHR_wayland_surface', 6, 'VK_USE_PLATFORM_WAYLAND_KHR'), Extension('VK_KHR_wayland_surface', 6, 'VK_USE_PLATFORM_WAYLAND_KHR'),
Extension('VK_KHR_xcb_surface', 6, 'VK_USE_PLATFORM_XCB_KHR'), Extension('VK_KHR_xcb_surface', 6, 'VK_USE_PLATFORM_XCB_KHR'),
@@ -165,6 +170,18 @@ _TEMPLATE = Template(COPYRIGHT + """
#endif #endif
%endfor %endfor
/* And ANDROID too */
#ifdef ANDROID
# undef ANDROID
# define ANDROID true
#else
# define ANDROID false
#endif
#define ANV_HAS_SURFACE (VK_USE_PLATFORM_WAYLAND_KHR || \\
VK_USE_PLATFORM_XCB_KHR || \\
VK_USE_PLATFORM_XLIB_KHR)
bool bool
anv_instance_extension_supported(const char *name) anv_instance_extension_supported(const char *name)
{ {