[Mesa-dev] [PATCH 04/16] radv: Update MAX_API_VERSION to 1.1.0
Bas Nieuwenhuizen
bas at basnieuwenhuizen.nl
Wed Mar 7 14:47:32 UTC 2018
v2: Don't bump supported version.
v3: Update json files.
Reviewed-by: Dave Airlie <airlied at redhat.com>
---
src/amd/vulkan/dev_icd.json.in | 2 +-
src/amd/vulkan/radeon_icd.json.in | 2 +-
src/amd/vulkan/radv_cmd_buffer.c | 2 +-
src/amd/vulkan/radv_descriptor_set.c | 22 +++++++++++-----------
src/amd/vulkan/radv_device.c | 34 +++++++++++++++++-----------------
src/amd/vulkan/radv_extensions.py | 4 ++--
src/amd/vulkan/radv_formats.c | 8 ++++----
7 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/amd/vulkan/dev_icd.json.in b/src/amd/vulkan/dev_icd.json.in
index cc80641f58..dfd032cdfb 100644
--- a/src/amd/vulkan/dev_icd.json.in
+++ b/src/amd/vulkan/dev_icd.json.in
@@ -2,6 +2,6 @@
"file_format_version": "1.0.0",
"ICD": {
"library_path": "@libvulkan_radeon_path@",
- "api_version": "1.0.3"
+ "api_version": "1.1.0"
}
}
diff --git a/src/amd/vulkan/radeon_icd.json.in b/src/amd/vulkan/radeon_icd.json.in
index a8b441d672..a99cb80ee9 100644
--- a/src/amd/vulkan/radeon_icd.json.in
+++ b/src/amd/vulkan/radeon_icd.json.in
@@ -2,6 +2,6 @@
"file_format_version": "1.0.0",
"ICD": {
"library_path": "@install_libdir@/libvulkan_radeon.so",
- "api_version": "1.0.3"
+ "api_version": "1.1.0"
}
}
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 2b41baea3d..9238f76305 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -2652,7 +2652,7 @@ VkResult radv_ResetCommandPool(
return VK_SUCCESS;
}
-void radv_TrimCommandPoolKHR(
+void radv_TrimCommandPool(
VkDevice device,
VkCommandPool commandPool,
VkCommandPoolTrimFlagsKHR flags)
diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c
index 056a5644df..38b8dc78e1 100644
--- a/src/amd/vulkan/radv_descriptor_set.c
+++ b/src/amd/vulkan/radv_descriptor_set.c
@@ -829,10 +829,10 @@ void radv_UpdateDescriptorSets(
descriptorCopyCount, pDescriptorCopies);
}
-VkResult radv_CreateDescriptorUpdateTemplateKHR(VkDevice _device,
- const VkDescriptorUpdateTemplateCreateInfoKHR *pCreateInfo,
- const VkAllocationCallbacks *pAllocator,
- VkDescriptorUpdateTemplateKHR *pDescriptorUpdateTemplate)
+VkResult radv_CreateDescriptorUpdateTemplate(VkDevice _device,
+ const VkDescriptorUpdateTemplateCreateInfoKHR *pCreateInfo,
+ const VkAllocationCallbacks *pAllocator,
+ VkDescriptorUpdateTemplateKHR *pDescriptorUpdateTemplate)
{
RADV_FROM_HANDLE(radv_device, device, _device);
RADV_FROM_HANDLE(radv_descriptor_set_layout, set_layout, pCreateInfo->descriptorSetLayout);
@@ -902,9 +902,9 @@ VkResult radv_CreateDescriptorUpdateTemplateKHR(VkDevice _device,
return VK_SUCCESS;
}
-void radv_DestroyDescriptorUpdateTemplateKHR(VkDevice _device,
- VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate,
- const VkAllocationCallbacks *pAllocator)
+void radv_DestroyDescriptorUpdateTemplate(VkDevice _device,
+ VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate,
+ const VkAllocationCallbacks *pAllocator)
{
RADV_FROM_HANDLE(radv_device, device, _device);
RADV_FROM_HANDLE(radv_descriptor_update_template, templ, descriptorUpdateTemplate);
@@ -983,10 +983,10 @@ void radv_update_descriptor_set_with_template(struct radv_device *device,
}
}
-void radv_UpdateDescriptorSetWithTemplateKHR(VkDevice _device,
- VkDescriptorSet descriptorSet,
- VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate,
- const void *pData)
+void radv_UpdateDescriptorSetWithTemplate(VkDevice _device,
+ VkDescriptorSet descriptorSet,
+ VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate,
+ const void *pData)
{
RADV_FROM_HANDLE(radv_device, device, _device);
RADV_FROM_HANDLE(radv_descriptor_set, set, descriptorSet);
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 666818f2c4..f152c79e1c 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -647,7 +647,7 @@ void radv_GetPhysicalDeviceFeatures(
};
}
-void radv_GetPhysicalDeviceFeatures2KHR(
+void radv_GetPhysicalDeviceFeatures2(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceFeatures2KHR *pFeatures)
{
@@ -820,7 +820,7 @@ void radv_GetPhysicalDeviceProperties(
memcpy(pProperties->pipelineCacheUUID, pdevice->cache_uuid, VK_UUID_SIZE);
}
-void radv_GetPhysicalDeviceProperties2KHR(
+void radv_GetPhysicalDeviceProperties2(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties2KHR *pProperties)
{
@@ -941,7 +941,7 @@ void radv_GetPhysicalDeviceQueueFamilyProperties(
assert(*pCount <= 3);
}
-void radv_GetPhysicalDeviceQueueFamilyProperties2KHR(
+void radv_GetPhysicalDeviceQueueFamilyProperties2(
VkPhysicalDevice physicalDevice,
uint32_t* pCount,
VkQueueFamilyProperties2KHR *pQueueFamilyProperties)
@@ -969,7 +969,7 @@ void radv_GetPhysicalDeviceMemoryProperties(
*pMemoryProperties = physical_device->memory_properties;
}
-void radv_GetPhysicalDeviceMemoryProperties2KHR(
+void radv_GetPhysicalDeviceMemoryProperties2(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceMemoryProperties2KHR *pMemoryProperties)
{
@@ -2567,7 +2567,7 @@ void radv_GetBufferMemoryRequirements(
pMemoryRequirements->size = align64(buffer->size, pMemoryRequirements->alignment);
}
-void radv_GetBufferMemoryRequirements2KHR(
+void radv_GetBufferMemoryRequirements2(
VkDevice device,
const VkBufferMemoryRequirementsInfo2KHR* pInfo,
VkMemoryRequirements2KHR* pMemoryRequirements)
@@ -2604,7 +2604,7 @@ void radv_GetImageMemoryRequirements(
pMemoryRequirements->alignment = image->alignment;
}
-void radv_GetImageMemoryRequirements2KHR(
+void radv_GetImageMemoryRequirements2(
VkDevice device,
const VkImageMemoryRequirementsInfo2KHR* pInfo,
VkMemoryRequirements2KHR* pMemoryRequirements)
@@ -2638,7 +2638,7 @@ void radv_GetImageSparseMemoryRequirements(
stub();
}
-void radv_GetImageSparseMemoryRequirements2KHR(
+void radv_GetImageSparseMemoryRequirements2(
VkDevice device,
const VkImageSparseMemoryRequirementsInfo2KHR* pInfo,
uint32_t* pSparseMemoryRequirementCount,
@@ -2655,9 +2655,9 @@ void radv_GetDeviceMemoryCommitment(
*pCommittedMemoryInBytes = 0;
}
-VkResult radv_BindBufferMemory2KHR(VkDevice device,
- uint32_t bindInfoCount,
- const VkBindBufferMemoryInfoKHR *pBindInfos)
+VkResult radv_BindBufferMemory2(VkDevice device,
+ uint32_t bindInfoCount,
+ const VkBindBufferMemoryInfoKHR *pBindInfos)
{
for (uint32_t i = 0; i < bindInfoCount; ++i) {
RADV_FROM_HANDLE(radv_device_memory, mem, pBindInfos[i].memory);
@@ -2686,12 +2686,12 @@ VkResult radv_BindBufferMemory(
.memoryOffset = memoryOffset
};
- return radv_BindBufferMemory2KHR(device, 1, &info);
+ return radv_BindBufferMemory2(device, 1, &info);
}
-VkResult radv_BindImageMemory2KHR(VkDevice device,
- uint32_t bindInfoCount,
- const VkBindImageMemoryInfoKHR *pBindInfos)
+VkResult radv_BindImageMemory2(VkDevice device,
+ uint32_t bindInfoCount,
+ const VkBindImageMemoryInfoKHR *pBindInfos)
{
for (uint32_t i = 0; i < bindInfoCount; ++i) {
RADV_FROM_HANDLE(radv_device_memory, mem, pBindInfos[i].memory);
@@ -2722,7 +2722,7 @@ VkResult radv_BindImageMemory(
.memoryOffset = memoryOffset
};
- return radv_BindImageMemory2KHR(device, 1, &info);
+ return radv_BindImageMemory2(device, 1, &info);
}
@@ -4080,7 +4080,7 @@ VkResult radv_GetSemaphoreFdKHR(VkDevice _device,
return VK_SUCCESS;
}
-void radv_GetPhysicalDeviceExternalSemaphorePropertiesKHR(
+void radv_GetPhysicalDeviceExternalSemaphoreProperties(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalSemaphoreInfoKHR* pExternalSemaphoreInfo,
VkExternalSemaphorePropertiesKHR* pExternalSemaphoreProperties)
@@ -4169,7 +4169,7 @@ VkResult radv_GetFenceFdKHR(VkDevice _device,
return VK_SUCCESS;
}
-void radv_GetPhysicalDeviceExternalFencePropertiesKHR(
+void radv_GetPhysicalDeviceExternalFenceProperties(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalFenceInfoKHR* pExternalFenceInfo,
VkExternalFencePropertiesKHR* pExternalFenceProperties)
diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py
index 6c143a21cd..6fa553e589 100644
--- a/src/amd/vulkan/radv_extensions.py
+++ b/src/amd/vulkan/radv_extensions.py
@@ -31,7 +31,7 @@ import xml.etree.cElementTree as et
from mako.template import Template
-MAX_API_VERSION = '1.0.57'
+MAX_API_VERSION = '1.1.0'
class Extension:
def __init__(self, name, ext_version, enable):
@@ -262,7 +262,7 @@ void radv_fill_device_extension_table(const struct radv_physical_device *device,
uint32_t
radv_physical_device_api_version(struct radv_physical_device *dev)
{
- return ${MAX_API_VERSION.c_vk_version()};
+ return VK_MAKE_VERSION(1, 0, 68);
}
""")
diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c
index a150f8c64f..da341a3a84 100644
--- a/src/amd/vulkan/radv_formats.c
+++ b/src/amd/vulkan/radv_formats.c
@@ -1026,7 +1026,7 @@ void radv_GetPhysicalDeviceFormatProperties(
pFormatProperties);
}
-void radv_GetPhysicalDeviceFormatProperties2KHR(
+void radv_GetPhysicalDeviceFormatProperties2(
VkPhysicalDevice physicalDevice,
VkFormat format,
VkFormatProperties2KHR* pFormatProperties)
@@ -1211,7 +1211,7 @@ get_external_image_format_properties(const VkPhysicalDeviceImageFormatInfo2KHR *
};
}
-VkResult radv_GetPhysicalDeviceImageFormatProperties2KHR(
+VkResult radv_GetPhysicalDeviceImageFormatProperties2(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceImageFormatInfo2KHR *base_info,
VkImageFormatProperties2KHR *base_props)
@@ -1308,7 +1308,7 @@ void radv_GetPhysicalDeviceSparseImageFormatProperties(
*pNumProperties = 0;
}
-void radv_GetPhysicalDeviceSparseImageFormatProperties2KHR(
+void radv_GetPhysicalDeviceSparseImageFormatProperties2(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceSparseImageFormatInfo2KHR* pFormatInfo,
uint32_t *pPropertyCount,
@@ -1318,7 +1318,7 @@ void radv_GetPhysicalDeviceSparseImageFormatProperties2KHR(
*pPropertyCount = 0;
}
-void radv_GetPhysicalDeviceExternalBufferPropertiesKHR(
+void radv_GetPhysicalDeviceExternalBufferProperties(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalBufferInfoKHR *pExternalBufferInfo,
VkExternalBufferPropertiesKHR *pExternalBufferProperties)
--
2.16.1
More information about the mesa-dev
mailing list