fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan/util: drop redundant code gen from vk_extensions_gen.py

Browse source 
driver is now always 'vk'.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27374>
This commit is contained in:
Yiwei Zhang 2024-01-30 13:21:51 -08:00 • committed by Marge Bot
parent 1e80a426c2
commit f7d35be362
1 changed files with 9 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
src/vulkan/util/vk_extensions_gen.py
View file

@ -34,13 +34,11 @@ from vk_extensions import get_all_exts_from_xml, init_exts_from_xml
_TEMPLATE_H = Template(COPYRIGHT + """
#ifndef ${driver.upper()}_EXTENSIONS_H
#define ${driver.upper()}_EXTENSIONS_H
#ifndef VK_EXTENSIONS_H
#define VK_EXTENSIONS_H
#include <stdbool.h>
%if driver == 'vk':
<%def name="extension_table(type, extensions)">
#define VK_${type.upper()}_EXTENSION_COUNT ${len(extensions)}
@ -68,44 +66,28 @@ struct vk_${type}_extension_table {
${extension_table('instance', instance_extensions)}
${extension_table('device', device_extensions)}
%else:
#include "vk_extensions.h"
%endif
struct vk_physical_device;
struct ${driver}_physical_device;
%if driver == 'vk':
#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
%else:
extern const struct vk_instance_extension_table ${driver}_instance_extensions_supported;
void
${driver}_physical_device_get_supported_extensions(const struct ${driver}_physical_device *device,
struct vk_device_extension_table *extensions);
%endif
#endif /* ${driver.upper()}_EXTENSIONS_H */
#endif /* VK_EXTENSIONS_H */
""")
_TEMPLATE_C = Template(COPYRIGHT + """
#include "vulkan/vulkan_core.h"
%if driver != 'vk':
#include "${driver}_private.h"
%endif
#include "${driver}_extensions.h"
#include "vk_extensions.h"
%if driver == 'vk':
const VkExtensionProperties ${driver}_instance_extensions[${driver.upper()}_INSTANCE_EXTENSION_COUNT] = {
const VkExtensionProperties vk_instance_extensions[VK_INSTANCE_EXTENSION_COUNT] = {
%for ext in instance_extensions:
{"${ext.name}", ${ext.ext_version}},
%endfor
};
const VkExtensionProperties ${driver}_device_extensions[${driver.upper()}_DEVICE_EXTENSION_COUNT] = {
const VkExtensionProperties vk_device_extensions[VK_DEVICE_EXTENSION_COUNT] = {
%for ext in device_extensions:
{"${ext.name}", ${ext.ext_version}},
%endfor
@ -124,84 +106,9 @@ const struct vk_device_extension_table vk_android_allowed_device_extensions = {
%endfor
};
#endif
%endif
%if driver != 'vk':
#include "vk_util.h"
/* Convert the VK_USE_PLATFORM_* defines to booleans */
%for platform_define in platform_defines:
#ifdef ${platform_define}
# undef ${platform_define}
# define ${platform_define} true
#else
# define ${platform_define} false
#endif
%endfor
/* And ANDROID too */
#ifdef ANDROID
# undef ANDROID
# define ANDROID true
#else
# define ANDROID false
# define ANDROID_API_LEVEL 0
#endif
#define ${driver.upper()}_HAS_SURFACE (VK_USE_PLATFORM_WIN32_KHR || \\
VK_USE_PLATFORM_WAYLAND_KHR || \\
VK_USE_PLATFORM_XCB_KHR || \\
VK_USE_PLATFORM_XLIB_KHR || \\
VK_USE_PLATFORM_DISPLAY_KHR)
static const uint32_t MAX_API_VERSION = ${MAX_API_VERSION.c_vk_version()};
VKAPI_ATTR VkResult VKAPI_CALL ${driver}_EnumerateInstanceVersion(
uint32_t* pApiVersion)
{
*pApiVersion = MAX_API_VERSION;
return VK_SUCCESS;
}
const struct vk_instance_extension_table ${driver}_instance_extensions_supported = {
%for ext in instance_extensions:
.${ext.name[3:]} = ${ext.enable},
%endfor
};
uint32_t
${driver}_physical_device_api_version(struct ${driver}_physical_device *device)
{
uint32_t version = 0;
uint32_t override = vk_get_version_override();
if (override)
return MIN2(override, MAX_API_VERSION);
%for version in API_VERSIONS:
if (!(${version.enable}))
return version;
version = ${version.version.c_vk_version()};
%endfor
return version;
}
void
${driver}_physical_device_get_supported_extensions(const struct ${driver}_physical_device *device,
struct vk_device_extension_table *extensions)
{
*extensions = (struct vk_device_extension_table) {
%for ext in device_extensions:
.${ext.name[3:]} = ${ext.enable},
%endfor
};
}
%endif
""")
def gen_extensions(driver, xml_files, api_versions, max_api_version,
extensions, out_c, out_h):
def gen_extensions(xml_files, extensions, out_c, out_h):
platform_defines = []
for filename in xml_files:
init_exts_from_xml(filename, extensions, platform_defines)
@ -210,9 +117,6 @@ def gen_extensions(driver, xml_files, api_versions, max_api_version,
assert ext.type in {'instance', 'device'}
template_env = {
'driver': driver,
'API_VERSIONS': api_versions,
'MAX_API_VERSION': max_api_version,
'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,
@ -242,8 +146,7 @@ def main():
for filename in args.xml_files:
extensions += get_all_exts_from_xml(filename)
gen_extensions('vk', args.xml_files, None, None,
extensions, args.out_c, args.out_h)
gen_extensions(args.xml_files, extensions, args.out_c, args.out_h)
if __name__ == '__main__':
main()