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

anv: use the common code for generating extensions and dispatch tables

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4987>
This commit is contained in:
Samuel Pitoiset
2020-05-11 15:08:16 +02:00
parent 857051c5c6
commit ddfae50b67
2 changed files with 14 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,26 +24,13 @@ COPYRIGHT = """\
*/
"""
import copy
import re
import os.path
import sys
def _bool_to_c_expr(b):
if b is True:
return 'true'
if b is False:
return 'false'
return b
VULKAN_UTIL = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../vulkan/util'))
sys.path.append(VULKAN_UTIL)
class Extension:
def __init__(self, name, ext_version, enable):
self.name = name
self.ext_version = int(ext_version)
self.enable = _bool_to_c_expr(enable)
class ApiVersion:
def __init__(self, version, enable):
self.version = version
self.enable = _bool_to_c_expr(enable)
from vk_extensions import *
API_PATCH_VERSION = 131
@@ -197,142 +184,9 @@ for i in range(len(EXTENSIONS) - 1):
print(EXTENSIONS[i + 1].name + ' should come before ' + EXTENSIONS[i].name)
exit(1)
class VkVersion:
def __init__(self, string):
split = string.split('.')
self.major = int(split[0])
self.minor = int(split[1])
if len(split) > 2:
assert len(split) == 3
self.patch = int(split[2])
else:
self.patch = None
# Sanity check. The range bits are required by the definition of the
# VK_MAKE_VERSION macro
assert self.major < 1024 and self.minor < 1024
assert self.patch is None or self.patch < 4096
assert str(self) == string
def __str__(self):
ver_list = [str(self.major), str(self.minor)]
if self.patch is not None:
ver_list.append(str(self.patch))
return '.'.join(ver_list)
def c_vk_version(self):
patch = self.patch if self.patch is not None else 0
ver_list = [str(self.major), str(self.minor), str(patch)]
return 'VK_MAKE_VERSION(' + ', '.join(ver_list) + ')'
def __int_ver(self):
# This is just an expansion of VK_VERSION
patch = self.patch if self.patch is not None else 0
return (self.major << 22) | (self.minor << 12) | patch
def __gt__(self, other):
# If only one of them has a patch version, "ignore" it by making
# other's patch version match self.
if (self.patch is None) != (other.patch is None):
other = copy.copy(other)
other.patch = self.patch
return self.__int_ver() > other.__int_ver()
MAX_API_VERSION = VkVersion('0.0.0')
for version in API_VERSIONS:
version.version = VkVersion(version.version)
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)