anv: Pull the API version from anv_extensions.py

This way everything stays in sync and we only have the one version
number.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Jason Ekstrand
2017-08-01 11:50:59 -07:00
parent 0ab04ba979
commit 077b200096
3 changed files with 13 additions and 1 deletions

View File

@@ -794,7 +794,7 @@ void anv_GetPhysicalDeviceProperties(
};
*pProperties = (VkPhysicalDeviceProperties) {
.apiVersion = VK_MAKE_VERSION(1, 0, 54),
.apiVersion = anv_physical_device_api_version(pdevice),
.driverVersion = vk_get_driver_version(),
.vendorID = 0x8086,
.deviceID = pdevice->chipset_id,

View File

@@ -91,6 +91,10 @@ class VkVersion:
ver_list.append(str(self.patch))
return '.'.join(ver_list)
def c_vk_version(self):
ver_list = [str(self.major), str(self.minor), str(self.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
@@ -173,6 +177,12 @@ VkResult anv_EnumerateInstanceExtensionProperties(
return vk_outarray_status(&out);
}
uint32_t
anv_physical_device_api_version(struct anv_physical_device *dev)
{
return ${MAX_API_VERSION.c_vk_version()};
}
bool
anv_physical_device_extension_supported(struct anv_physical_device *device,
const char *name)
@@ -218,6 +228,7 @@ if __name__ == '__main__':
_init_exts_from_xml(args.xml)
template_env = {
'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'],
}

View File

@@ -685,6 +685,7 @@ VkResult anv_init_wsi(struct anv_physical_device *physical_device);
void anv_finish_wsi(struct anv_physical_device *physical_device);
bool anv_instance_extension_supported(const char *name);
uint32_t anv_physical_device_api_version(struct anv_physical_device *dev);
bool anv_physical_device_extension_supported(struct anv_physical_device *dev,
const char *name);