Commit af461986 authored by Jason Ekstrand's avatar Jason Ekstrand

anv: Add version 1.1.0 but leave it disabled

This requires us to rename any Vulkan API entrypoints which became core
in 1.1 to no longer have the KHR suffix.
Reviewed-by: Lionel Landwerlin's avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Samuel Iglesias Gonsálvez's avatarSamuel Iglesias Gonsálvez <siglesias@igalia.com>
parent 01281873
......@@ -875,7 +875,7 @@ VkResult anv_ResetCommandPool(
return VK_SUCCESS;
}
void anv_TrimCommandPoolKHR(
void anv_TrimCommandPool(
VkDevice device,
VkCommandPool commandPool,
VkCommandPoolTrimFlagsKHR flags)
......
......@@ -890,7 +890,7 @@ anv_descriptor_set_write_template(struct anv_descriptor_set *set,
}
}
VkResult anv_CreateDescriptorUpdateTemplateKHR(
VkResult anv_CreateDescriptorUpdateTemplate(
VkDevice _device,
const VkDescriptorUpdateTemplateCreateInfoKHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
......@@ -932,7 +932,7 @@ VkResult anv_CreateDescriptorUpdateTemplateKHR(
return VK_SUCCESS;
}
void anv_DestroyDescriptorUpdateTemplateKHR(
void anv_DestroyDescriptorUpdateTemplate(
VkDevice _device,
VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate,
const VkAllocationCallbacks* pAllocator)
......@@ -944,7 +944,7 @@ void anv_DestroyDescriptorUpdateTemplateKHR(
vk_free2(&device->alloc, pAllocator, template);
}
void anv_UpdateDescriptorSetWithTemplateKHR(
void anv_UpdateDescriptorSetWithTemplate(
VkDevice _device,
VkDescriptorSet descriptorSet,
VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate,
......
......@@ -759,7 +759,7 @@ void anv_GetPhysicalDeviceFeatures(
pdevice->compiler->scalar_stage[MESA_SHADER_GEOMETRY];
}
void anv_GetPhysicalDeviceFeatures2KHR(
void anv_GetPhysicalDeviceFeatures2(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceFeatures2KHR* pFeatures)
{
......@@ -956,7 +956,7 @@ void anv_GetPhysicalDeviceProperties(
pdevice->pipeline_cache_uuid, VK_UUID_SIZE);
}
void anv_GetPhysicalDeviceProperties2KHR(
void anv_GetPhysicalDeviceProperties2(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties2KHR* pProperties)
{
......@@ -1030,7 +1030,7 @@ void anv_GetPhysicalDeviceQueueFamilyProperties(
}
}
void anv_GetPhysicalDeviceQueueFamilyProperties2KHR(
void anv_GetPhysicalDeviceQueueFamilyProperties2(
VkPhysicalDevice physicalDevice,
uint32_t* pQueueFamilyPropertyCount,
VkQueueFamilyProperties2KHR* pQueueFamilyProperties)
......@@ -1070,7 +1070,7 @@ void anv_GetPhysicalDeviceMemoryProperties(
}
}
void anv_GetPhysicalDeviceMemoryProperties2KHR(
void anv_GetPhysicalDeviceMemoryProperties2(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceMemoryProperties2KHR* pMemoryProperties)
{
......@@ -2170,7 +2170,7 @@ void anv_GetBufferMemoryRequirements(
pMemoryRequirements->memoryTypeBits = memory_types;
}
void anv_GetBufferMemoryRequirements2KHR(
void anv_GetBufferMemoryRequirements2(
VkDevice _device,
const VkBufferMemoryRequirementsInfo2KHR* pInfo,
VkMemoryRequirements2KHR* pMemoryRequirements)
......@@ -2219,7 +2219,7 @@ void anv_GetImageMemoryRequirements(
pMemoryRequirements->memoryTypeBits = memory_types;
}
void anv_GetImageMemoryRequirements2KHR(
void anv_GetImageMemoryRequirements2(
VkDevice _device,
const VkImageMemoryRequirementsInfo2KHR* pInfo,
VkMemoryRequirements2KHR* pMemoryRequirements)
......@@ -2301,7 +2301,7 @@ void anv_GetImageSparseMemoryRequirements(
*pSparseMemoryRequirementCount = 0;
}
void anv_GetImageSparseMemoryRequirements2KHR(
void anv_GetImageSparseMemoryRequirements2(
VkDevice device,
const VkImageSparseMemoryRequirementsInfo2KHR* pInfo,
uint32_t* pSparseMemoryRequirementCount,
......@@ -2353,7 +2353,7 @@ VkResult anv_BindBufferMemory(
return VK_SUCCESS;
}
VkResult anv_BindBufferMemory2KHR(
VkResult anv_BindBufferMemory2(
VkDevice device,
uint32_t bindInfoCount,
const VkBindBufferMemoryInfoKHR* pBindInfos)
......
......@@ -54,6 +54,7 @@ class ApiVersion:
# available.
API_VERSIONS = [
ApiVersion('1.0.57', True),
ApiVersion('1.1.0', False),
]
MAX_API_VERSION = None # Computed later
......
......@@ -705,7 +705,7 @@ void anv_GetPhysicalDeviceFormatProperties(
};
}
void anv_GetPhysicalDeviceFormatProperties2KHR(
void anv_GetPhysicalDeviceFormatProperties2(
VkPhysicalDevice physicalDevice,
VkFormat format,
VkFormatProperties2KHR* pFormatProperties)
......@@ -924,7 +924,7 @@ static const VkExternalMemoryPropertiesKHR prime_fd_props = {
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
};
VkResult anv_GetPhysicalDeviceImageFormatProperties2KHR(
VkResult anv_GetPhysicalDeviceImageFormatProperties2(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceImageFormatInfo2KHR* base_info,
VkImageFormatProperties2KHR* base_props)
......@@ -1027,7 +1027,7 @@ void anv_GetPhysicalDeviceSparseImageFormatProperties(
*pNumProperties = 0;
}
void anv_GetPhysicalDeviceSparseImageFormatProperties2KHR(
void anv_GetPhysicalDeviceSparseImageFormatProperties2(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceSparseImageFormatInfo2KHR* pFormatInfo,
uint32_t* pPropertyCount,
......@@ -1037,7 +1037,7 @@ void anv_GetPhysicalDeviceSparseImageFormatProperties2KHR(
*pPropertyCount = 0;
}
void anv_GetPhysicalDeviceExternalBufferPropertiesKHR(
void anv_GetPhysicalDeviceExternalBufferProperties(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalBufferInfoKHR* pExternalBufferInfo,
VkExternalBufferPropertiesKHR* pExternalBufferProperties)
......@@ -1071,7 +1071,7 @@ void anv_GetPhysicalDeviceExternalBufferPropertiesKHR(
(VkExternalMemoryPropertiesKHR) {0};
}
VkResult anv_CreateSamplerYcbcrConversionKHR(
VkResult anv_CreateSamplerYcbcrConversion(
VkDevice _device,
const VkSamplerYcbcrConversionCreateInfoKHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
......@@ -1116,7 +1116,7 @@ VkResult anv_CreateSamplerYcbcrConversionKHR(
return VK_SUCCESS;
}
void anv_DestroySamplerYcbcrConversionKHR(
void anv_DestroySamplerYcbcrConversion(
VkDevice _device,
VkSamplerYcbcrConversionKHR YcbcrConversion,
const VkAllocationCallbacks* pAllocator)
......
......@@ -699,7 +699,7 @@ VkResult anv_BindImageMemory(
return VK_SUCCESS;
}
VkResult anv_BindImageMemory2KHR(
VkResult anv_BindImageMemory2(
VkDevice _device,
uint32_t bindInfoCount,
const VkBindImageMemoryInfoKHR* pBindInfos)
......
......@@ -682,7 +682,7 @@ VkResult anv_WaitForFences(
}
}
void anv_GetPhysicalDeviceExternalFencePropertiesKHR(
void anv_GetPhysicalDeviceExternalFenceProperties(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalFenceInfoKHR* pExternalFenceInfo,
VkExternalFencePropertiesKHR* pExternalFenceProperties)
......@@ -960,7 +960,7 @@ void anv_DestroySemaphore(
vk_free2(&device->alloc, pAllocator, semaphore);
}
void anv_GetPhysicalDeviceExternalSemaphorePropertiesKHR(
void anv_GetPhysicalDeviceExternalSemaphoreProperties(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalSemaphoreInfoKHR* pExternalSemaphoreInfo,
VkExternalSemaphorePropertiesKHR* pExternalSemaphoreProperties)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment