anv: Disable extensions based on Android versions

This extends commit 2243f0cd for anv with additional
extensions for Pie and Q versions.

Fixes tests with 9_R11 CTS:
dEQP-VK.api.info.android#no_unknown_extensions
dEQP-VK.api.info.device#extensions.

v2: Use snake_case function name (Jason Ekstrand)
    Drop Change-Id in commit (Kristian H. Kristensen)

v3: Resolve meson-clang error for ANDROID_API_LEVEL.

Signed-off-by: Nataraj Deshpande <nataraj.deshpande@intel.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4827>

diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py
index 2f33f7592a33ea0f7e3e66b65f45ab06f6f586ac..a86ca6b10bb6b2212ebfbce590021af8611a25f3 100644 (file)
--- a/src/intel/vulkan/anv_extensions.py
+++ b/src/intel/vulkan/anv_extensions.py
@@ -246,3 +246,92 @@ for version in API_VERSIONS:
     version.version.patch = API_PATCH_VERSION
     assert version.version > MAX_API_VERSION
     MAX_API_VERSION = version.version
+
+# Mapping between extension name and the android version in which the extension
+# was whitelisted in Android CTS.
+allowed_android_version = {
+    # Allowed Instance KHR Extensions
+    "VK_KHR_surface": 26,
+    "VK_KHR_display": 26,
+    "VK_KHR_android_surface": 26,
+    "VK_KHR_mir_surface": 26,
+    "VK_KHR_wayland_surface": 26,
+    "VK_KHR_win32_surface": 26,
+    "VK_KHR_xcb_surface": 26,
+    "VK_KHR_xlib_surface": 26,
+    "VK_KHR_get_physical_device_properties2": 26,
+    "VK_KHR_get_surface_capabilities2": 26,
+    "VK_KHR_external_memory_capabilities": 28,
+    "VK_KHR_external_semaphore_capabilities": 28,
+    "VK_KHR_external_fence_capabilities": 28,
+    "VK_KHR_device_group_creation": 28,
+    "VK_KHR_get_display_properties2": 29,
+    "VK_KHR_surface_protected_capabilities": 29,
+
+    # Allowed Device KHR Extensions
+    "VK_KHR_swapchain": 26,
+    "VK_KHR_display_swapchain": 26,
+    "VK_KHR_sampler_mirror_clamp_to_edge": 26,
+    "VK_KHR_shader_draw_parameters": 26,
+    "VK_KHR_shader_float_controls": 29,
+    "VK_KHR_shader_float16_int8": 29,
+    "VK_KHR_maintenance1": 26,
+    "VK_KHR_push_descriptor": 26,
+    "VK_KHR_descriptor_update_template": 26,
+    "VK_KHR_incremental_present": 26,
+    "VK_KHR_shared_presentable_image": 26,
+    "VK_KHR_storage_buffer_storage_class": 28,
+    "VK_KHR_8bit_storage": 29,
+    "VK_KHR_16bit_storage": 28,
+    "VK_KHR_get_memory_requirements2": 28,
+    "VK_KHR_external_memory": 28,
+    "VK_KHR_external_memory_fd": 28,
+    "VK_KHR_external_memory_win32": 28,
+    "VK_KHR_external_semaphore": 28,
+    "VK_KHR_external_semaphore_fd": 28,
+    "VK_KHR_external_semaphore_win32": 28,
+    "VK_KHR_external_fence": 28,
+    "VK_KHR_external_fence_fd": 28,
+    "VK_KHR_external_fence_win32": 28,
+    "VK_KHR_win32_keyed_mutex": 28,
+    "VK_KHR_dedicated_allocation": 28,
+    "VK_KHR_variable_pointers": 28,
+    "VK_KHR_relaxed_block_layout": 28,
+    "VK_KHR_bind_memory2": 28,
+    "VK_KHR_maintenance2": 28,
+    "VK_KHR_image_format_list": 28,
+    "VK_KHR_sampler_ycbcr_conversion": 28,
+    "VK_KHR_device_group": 28,
+    "VK_KHR_multiview": 28,
+    "VK_KHR_maintenance3": 28,
+    "VK_KHR_draw_indirect_count": 28,
+    "VK_KHR_create_renderpass2": 28,
+    "VK_KHR_depth_stencil_resolve": 29,
+    "VK_KHR_driver_properties": 28,
+    "VK_KHR_swapchain_mutable_format": 29,
+    "VK_KHR_shader_atomic_int64": 29,
+    "VK_KHR_vulkan_memory_model": 29,
+
+    "VK_GOOGLE_display_timing": 26,
+    "VK_ANDROID_native_buffer": 26,
+    "VK_ANDROID_external_memory_android_hardware_buffer": 28,
+}
+
+# Extensions with these prefixes are checked in Android CTS, and thus must be
+# whitelisted per the preceding dict.
+android_extension_whitelist_prefixes = (
+    "VK_KHX",
+    "VK_KHR",
+    "VK_GOOGLE",
+    "VK_ANDROID"
+)
+
+def get_extension_condition(ext_name, condition):
+    """ If |ext_name| is an extension that Android CTS cares about, prepend
+        a condition to ensure that the extension is only enabled for Android
+        versions in which the extension is whitelisted in CTS. """
+    if not ext_name.startswith(android_extension_whitelist_prefixes):
+        return condition
+    allowed_version = allowed_android_version.get(ext_name, 9999)
+    return "(!ANDROID || ANDROID_API_LEVEL >= %d) && (%s)" % (allowed_version,
+                                                              condition)

diff --git a/src/intel/vulkan/anv_extensions_gen.py b/src/intel/vulkan/anv_extensions_gen.py
index e83c0e1695864a161117aaf79c3ad4a5fe8177da..187a58491c1339c5763b499fbddd509a62d9d2c8 100644 (file)
--- a/src/intel/vulkan/anv_extensions_gen.py
+++ b/src/intel/vulkan/anv_extensions_gen.py
@@ -125,6 +125,7 @@ _TEMPLATE_C = Template(COPYRIGHT + """
 #   define ANDROID true
 #else
 #   define ANDROID false
+#   define ANDROID_API_LEVEL 0
 #endif
 
 #define ANV_HAS_SURFACE (VK_USE_PLATFORM_WAYLAND_KHR || \\
@@ -149,7 +150,7 @@ const VkExtensionProperties anv_instance_extensions[ANV_INSTANCE_EXTENSION_COUNT
 
 const struct anv_instance_extension_table anv_instance_extensions_supported = {
 %for ext in instance_extensions:
-   .${ext.name[3:]} = ${ext.enable},
+   .${ext.name[3:]} = ${get_extension_condition(ext.name, ext.enable)},
 %endfor
 };
 
@@ -183,7 +184,7 @@ anv_physical_device_get_supported_extensions(const struct anv_physical_device *d
 {
    *extensions = (struct anv_device_extension_table) {
 %for ext in device_extensions:
-      .${ext.name[3:]} = ${ext.enable},
+      .${ext.name[3:]} = ${get_extension_condition(ext.name, ext.enable)},
 %endfor
    };
 }
@@ -212,6 +213,7 @@ if __name__ == '__main__':
         'instance_extensions': [e for e in EXTENSIONS if e.type == 'instance'],
         'device_extensions': [e for e in EXTENSIONS if e.type == 'device'],
         'platform_defines': platform_defines,
+        'get_extension_condition': get_extension_condition,
     }
 
     if args.out_h: