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

anv: Add version 1.1.0 but leave it disabled

Browse Source 
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 <lionel.g.landwerlin@intel.com>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
This commit is contained in:
Jason Ekstrand
2017-09-20 12:18:10 -07:00
parent 0128187335
commit af461986db
7 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/intel/vulkan/anv_cmd_buffer.c
View File

@@ -875,7 +875,7 @@ VkResult anv_ResetCommandPool(
return VK_SUCCESS; return VK_SUCCESS;
} }
void anv_TrimCommandPoolKHR( void anv_TrimCommandPool(
VkDevice device, VkDevice device,
VkCommandPool commandPool, VkCommandPool commandPool,
VkCommandPoolTrimFlagsKHR flags) VkCommandPoolTrimFlagsKHR flags)

6
src/intel/vulkan/anv_descriptor_set.c
View File

@@ -890,7 +890,7 @@ anv_descriptor_set_write_template(struct anv_descriptor_set *set,
} }
} }
VkResult anv_CreateDescriptorUpdateTemplateKHR( VkResult anv_CreateDescriptorUpdateTemplate(
VkDevice _device, VkDevice _device,
const VkDescriptorUpdateTemplateCreateInfoKHR* pCreateInfo, const VkDescriptorUpdateTemplateCreateInfoKHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator, const VkAllocationCallbacks* pAllocator,
@@ -932,7 +932,7 @@ VkResult anv_CreateDescriptorUpdateTemplateKHR(
return VK_SUCCESS; return VK_SUCCESS;
} }
void anv_DestroyDescriptorUpdateTemplateKHR( void anv_DestroyDescriptorUpdateTemplate(
VkDevice _device, VkDevice _device,
VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate,
const VkAllocationCallbacks* pAllocator) const VkAllocationCallbacks* pAllocator)
@@ -944,7 +944,7 @@ void anv_DestroyDescriptorUpdateTemplateKHR(
vk_free2(&device->alloc, pAllocator, template); vk_free2(&device->alloc, pAllocator, template);
} }
void anv_UpdateDescriptorSetWithTemplateKHR( void anv_UpdateDescriptorSetWithTemplate(
VkDevice _device, VkDevice _device,
VkDescriptorSet descriptorSet, VkDescriptorSet descriptorSet,
VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate,

16
src/intel/vulkan/anv_device.c
View File

@@ -759,7 +759,7 @@ void anv_GetPhysicalDeviceFeatures(
pdevice->compiler->scalar_stage[MESA_SHADER_GEOMETRY]; pdevice->compiler->scalar_stage[MESA_SHADER_GEOMETRY];
} }
void anv_GetPhysicalDeviceFeatures2KHR( void anv_GetPhysicalDeviceFeatures2(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
VkPhysicalDeviceFeatures2KHR* pFeatures) VkPhysicalDeviceFeatures2KHR* pFeatures)
{ {
@@ -956,7 +956,7 @@ void anv_GetPhysicalDeviceProperties(
pdevice->pipeline_cache_uuid, VK_UUID_SIZE); pdevice->pipeline_cache_uuid, VK_UUID_SIZE);
} }
void anv_GetPhysicalDeviceProperties2KHR( void anv_GetPhysicalDeviceProperties2(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties2KHR* pProperties) VkPhysicalDeviceProperties2KHR* pProperties)
{ {
@@ -1030,7 +1030,7 @@ void anv_GetPhysicalDeviceQueueFamilyProperties(
} }
} }
void anv_GetPhysicalDeviceQueueFamilyProperties2KHR( void anv_GetPhysicalDeviceQueueFamilyProperties2(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
uint32_t* pQueueFamilyPropertyCount, uint32_t* pQueueFamilyPropertyCount,
VkQueueFamilyProperties2KHR* pQueueFamilyProperties) VkQueueFamilyProperties2KHR* pQueueFamilyProperties)
@@ -1070,7 +1070,7 @@ void anv_GetPhysicalDeviceMemoryProperties(
} }
} }
void anv_GetPhysicalDeviceMemoryProperties2KHR( void anv_GetPhysicalDeviceMemoryProperties2(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
VkPhysicalDeviceMemoryProperties2KHR* pMemoryProperties) VkPhysicalDeviceMemoryProperties2KHR* pMemoryProperties)
{ {
@@ -2170,7 +2170,7 @@ void anv_GetBufferMemoryRequirements(
pMemoryRequirements->memoryTypeBits = memory_types; pMemoryRequirements->memoryTypeBits = memory_types;
} }
void anv_GetBufferMemoryRequirements2KHR( void anv_GetBufferMemoryRequirements2(
VkDevice _device, VkDevice _device,
const VkBufferMemoryRequirementsInfo2KHR* pInfo, const VkBufferMemoryRequirementsInfo2KHR* pInfo,
VkMemoryRequirements2KHR* pMemoryRequirements) VkMemoryRequirements2KHR* pMemoryRequirements)
@@ -2219,7 +2219,7 @@ void anv_GetImageMemoryRequirements(
pMemoryRequirements->memoryTypeBits = memory_types; pMemoryRequirements->memoryTypeBits = memory_types;
} }
void anv_GetImageMemoryRequirements2KHR( void anv_GetImageMemoryRequirements2(
VkDevice _device, VkDevice _device,
const VkImageMemoryRequirementsInfo2KHR* pInfo, const VkImageMemoryRequirementsInfo2KHR* pInfo,
VkMemoryRequirements2KHR* pMemoryRequirements) VkMemoryRequirements2KHR* pMemoryRequirements)
@@ -2301,7 +2301,7 @@ void anv_GetImageSparseMemoryRequirements(
*pSparseMemoryRequirementCount = 0; *pSparseMemoryRequirementCount = 0;
} }
void anv_GetImageSparseMemoryRequirements2KHR( void anv_GetImageSparseMemoryRequirements2(
VkDevice device, VkDevice device,
const VkImageSparseMemoryRequirementsInfo2KHR* pInfo, const VkImageSparseMemoryRequirementsInfo2KHR* pInfo,
uint32_t* pSparseMemoryRequirementCount, uint32_t* pSparseMemoryRequirementCount,
@@ -2353,7 +2353,7 @@ VkResult anv_BindBufferMemory(
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult anv_BindBufferMemory2KHR( VkResult anv_BindBufferMemory2(
VkDevice device, VkDevice device,
uint32_t bindInfoCount, uint32_t bindInfoCount,
const VkBindBufferMemoryInfoKHR* pBindInfos) const VkBindBufferMemoryInfoKHR* pBindInfos)

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

@@ -54,6 +54,7 @@ class ApiVersion:
# available. # available.
API_VERSIONS = [ API_VERSIONS = [
ApiVersion('1.0.57', True), ApiVersion('1.0.57', True),
ApiVersion('1.1.0', False),
] ]
MAX_API_VERSION = None # Computed later MAX_API_VERSION = None # Computed later

12
src/intel/vulkan/anv_formats.c
View File

@@ -705,7 +705,7 @@ void anv_GetPhysicalDeviceFormatProperties(
}; };
} }
void anv_GetPhysicalDeviceFormatProperties2KHR( void anv_GetPhysicalDeviceFormatProperties2(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
VkFormat format, VkFormat format,
VkFormatProperties2KHR* pFormatProperties) VkFormatProperties2KHR* pFormatProperties)
@@ -924,7 +924,7 @@ static const VkExternalMemoryPropertiesKHR prime_fd_props = {
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT, VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
}; };
VkResult anv_GetPhysicalDeviceImageFormatProperties2KHR( VkResult anv_GetPhysicalDeviceImageFormatProperties2(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceImageFormatInfo2KHR* base_info, const VkPhysicalDeviceImageFormatInfo2KHR* base_info,
VkImageFormatProperties2KHR* base_props) VkImageFormatProperties2KHR* base_props)
@@ -1027,7 +1027,7 @@ void anv_GetPhysicalDeviceSparseImageFormatProperties(
*pNumProperties = 0; *pNumProperties = 0;
} }
void anv_GetPhysicalDeviceSparseImageFormatProperties2KHR( void anv_GetPhysicalDeviceSparseImageFormatProperties2(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceSparseImageFormatInfo2KHR* pFormatInfo, const VkPhysicalDeviceSparseImageFormatInfo2KHR* pFormatInfo,
uint32_t* pPropertyCount, uint32_t* pPropertyCount,
@@ -1037,7 +1037,7 @@ void anv_GetPhysicalDeviceSparseImageFormatProperties2KHR(
*pPropertyCount = 0; *pPropertyCount = 0;
} }
void anv_GetPhysicalDeviceExternalBufferPropertiesKHR( void anv_GetPhysicalDeviceExternalBufferProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalBufferInfoKHR* pExternalBufferInfo, const VkPhysicalDeviceExternalBufferInfoKHR* pExternalBufferInfo,
VkExternalBufferPropertiesKHR* pExternalBufferProperties) VkExternalBufferPropertiesKHR* pExternalBufferProperties)
@@ -1071,7 +1071,7 @@ void anv_GetPhysicalDeviceExternalBufferPropertiesKHR(
(VkExternalMemoryPropertiesKHR) {0}; (VkExternalMemoryPropertiesKHR) {0};
} }
VkResult anv_CreateSamplerYcbcrConversionKHR( VkResult anv_CreateSamplerYcbcrConversion(
VkDevice _device, VkDevice _device,
const VkSamplerYcbcrConversionCreateInfoKHR* pCreateInfo, const VkSamplerYcbcrConversionCreateInfoKHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator, const VkAllocationCallbacks* pAllocator,
@@ -1116,7 +1116,7 @@ VkResult anv_CreateSamplerYcbcrConversionKHR(
return VK_SUCCESS; return VK_SUCCESS;
} }
void anv_DestroySamplerYcbcrConversionKHR( void anv_DestroySamplerYcbcrConversion(
VkDevice _device, VkDevice _device,
VkSamplerYcbcrConversionKHR YcbcrConversion, VkSamplerYcbcrConversionKHR YcbcrConversion,
const VkAllocationCallbacks* pAllocator) const VkAllocationCallbacks* pAllocator)

2
src/intel/vulkan/anv_image.c
View File

@@ -699,7 +699,7 @@ VkResult anv_BindImageMemory(
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult anv_BindImageMemory2KHR( VkResult anv_BindImageMemory2(
VkDevice _device, VkDevice _device,
uint32_t bindInfoCount, uint32_t bindInfoCount,
const VkBindImageMemoryInfoKHR* pBindInfos) const VkBindImageMemoryInfoKHR* pBindInfos)

4
src/intel/vulkan/anv_queue.c
View File

@@ -682,7 +682,7 @@ VkResult anv_WaitForFences(
} }
} }
void anv_GetPhysicalDeviceExternalFencePropertiesKHR( void anv_GetPhysicalDeviceExternalFenceProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalFenceInfoKHR* pExternalFenceInfo, const VkPhysicalDeviceExternalFenceInfoKHR* pExternalFenceInfo,
VkExternalFencePropertiesKHR* pExternalFenceProperties) VkExternalFencePropertiesKHR* pExternalFenceProperties)
@@ -960,7 +960,7 @@ void anv_DestroySemaphore(
vk_free2(&device->alloc, pAllocator, semaphore); vk_free2(&device->alloc, pAllocator, semaphore);
} }
void anv_GetPhysicalDeviceExternalSemaphorePropertiesKHR( void anv_GetPhysicalDeviceExternalSemaphoreProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalSemaphoreInfoKHR* pExternalSemaphoreInfo, const VkPhysicalDeviceExternalSemaphoreInfoKHR* pExternalSemaphoreInfo,
VkExternalSemaphorePropertiesKHR* pExternalSemaphoreProperties) VkExternalSemaphorePropertiesKHR* pExternalSemaphoreProperties)