vulkan: API renaming
VK_DEVICE_QUEUE_CREATE_INFO => VkDeviceQueueCreateInfo
VK_DEVICE_CREATE_INFO => VkDeviceCreateInfo
VK_INSTANCE_CREATE_INFO => VkInstanceCreateInfo
VK_LAYER_CREATE_INFO => VkLayerCreateInfo
VK_MEMORY_ALLOC_INFO => VkMemoryAllocInfo
VK_MEMORY_ALLOC_IMAGE_INFO => VkMemoryAllocImageInfo
VK_MEMORY_ALLOC_BUFFER_INFO => VkMemoryAllocBufferInfo
VK_BUFFER_CREATE_INFO => VkBufferCreateInfo
VK_BUFFER_VIEW_CREATE_INFO => VkBufferViewCreateInfo
diff --git a/icd/intel/buf.c b/icd/intel/buf.c
index 55d1dad..a6a3c76 100644
--- a/icd/intel/buf.c
+++ b/icd/intel/buf.c
@@ -87,7 +87,7 @@
}
VK_RESULT intel_buf_create(struct intel_dev *dev,
- const VK_BUFFER_CREATE_INFO *info,
+ const VkBufferCreateInfo *info,
struct intel_buf **buf_ret)
{
struct intel_buf *buf;
@@ -115,7 +115,7 @@
ICD_EXPORT VK_RESULT VKAPI vkCreateBuffer(
VK_DEVICE device,
- const VK_BUFFER_CREATE_INFO* pCreateInfo,
+ const VkBufferCreateInfo* pCreateInfo,
VK_BUFFER* pBuffer)
{
struct intel_dev *dev = intel_dev(device);
diff --git a/icd/intel/buf.h b/icd/intel/buf.h
index f570141..4507632 100644
--- a/icd/intel/buf.h
+++ b/icd/intel/buf.h
@@ -54,7 +54,7 @@
}
VK_RESULT intel_buf_create(struct intel_dev *dev,
- const VK_BUFFER_CREATE_INFO *info,
+ const VkBufferCreateInfo *info,
struct intel_buf **buf_ret);
void intel_buf_destroy(struct intel_buf *buf);
diff --git a/icd/intel/cmd_meta.c b/icd/intel/cmd_meta.c
index ee042bd..f5622e9 100644
--- a/icd/intel/cmd_meta.c
+++ b/icd/intel/cmd_meta.c
@@ -37,7 +37,7 @@
VK_FORMAT format,
struct intel_buf_view **view)
{
- VK_BUFFER_VIEW_CREATE_INFO info;
+ VkBufferViewCreateInfo info;
VK_GPU_SIZE stride;
memset(&info, 0, sizeof(info));
@@ -724,7 +724,7 @@
struct intel_img *src = intel_img(srcImage);
struct intel_img *dst = intel_img(destImage);
struct intel_buf *src_buf, *dst_buf;
- VK_BUFFER_CREATE_INFO buf_info;
+ VkBufferCreateInfo buf_info;
VK_BUFFER_COPY buf_region;
VK_RESULT res;
diff --git a/icd/intel/dev.c b/icd/intel/dev.c
index 94bcd42..44eaea2 100644
--- a/icd/intel/dev.c
+++ b/icd/intel/dev.c
@@ -66,7 +66,7 @@
}
static VK_RESULT dev_create_queues(struct intel_dev *dev,
- const VK_DEVICE_QUEUE_CREATE_INFO *queues,
+ const VkDeviceQueueCreateInfo *queues,
uint32_t count)
{
uint32_t i;
@@ -75,7 +75,7 @@
return VK_ERROR_INVALID_POINTER;
for (i = 0; i < count; i++) {
- const VK_DEVICE_QUEUE_CREATE_INFO *q = &queues[i];
+ const VkDeviceQueueCreateInfo *q = &queues[i];
VK_RESULT ret = VK_SUCCESS;
if (q->queueNodeIndex < INTEL_GPU_ENGINE_COUNT &&
@@ -100,7 +100,7 @@
}
VK_RESULT intel_dev_create(struct intel_gpu *gpu,
- const VK_DEVICE_CREATE_INFO *info,
+ const VkDeviceCreateInfo *info,
struct intel_dev **dev_ret)
{
struct intel_dev *dev;
@@ -321,7 +321,7 @@
ICD_EXPORT VK_RESULT VKAPI vkCreateDevice(
VK_PHYSICAL_GPU gpu_,
- const VK_DEVICE_CREATE_INFO* pCreateInfo,
+ const VkDeviceCreateInfo* pCreateInfo,
VK_DEVICE* pDevice)
{
struct intel_gpu *gpu = intel_gpu(gpu_);
diff --git a/icd/intel/dev.h b/icd/intel/dev.h
index 7cb1ee3..f8803a3 100644
--- a/icd/intel/dev.h
+++ b/icd/intel/dev.h
@@ -187,7 +187,7 @@
}
VK_RESULT intel_dev_create(struct intel_gpu *gpu,
- const VK_DEVICE_CREATE_INFO *info,
+ const VkDeviceCreateInfo *info,
struct intel_dev **dev_ret);
void intel_dev_destroy(struct intel_dev *dev);
diff --git a/icd/intel/instance.c b/icd/intel/instance.c
index b39774c..ad3f6db 100644
--- a/icd/intel/instance.c
+++ b/icd/intel/instance.c
@@ -108,7 +108,7 @@
icd_instance_destroy(icd);
}
-static struct intel_instance *intel_instance_create(const VK_INSTANCE_CREATE_INFO* info)
+static struct intel_instance *intel_instance_create(const VkInstanceCreateInfo* info)
{
struct intel_instance *instance;
struct icd_instance *icd;
@@ -143,7 +143,7 @@
}
ICD_EXPORT VK_RESULT VKAPI vkCreateInstance(
- const VK_INSTANCE_CREATE_INFO* pCreateInfo,
+ const VkInstanceCreateInfo* pCreateInfo,
VK_INSTANCE* pInstance)
{
struct intel_instance *instance;
diff --git a/icd/intel/mem.c b/icd/intel/mem.c
index 833bf98..81a120a 100644
--- a/icd/intel/mem.c
+++ b/icd/intel/mem.c
@@ -29,7 +29,7 @@
#include "mem.h"
VK_RESULT intel_mem_alloc(struct intel_dev *dev,
- const VK_MEMORY_ALLOC_INFO *info,
+ const VkMemoryAllocInfo *info,
struct intel_mem **mem_ret)
{
struct intel_mem *mem;
@@ -101,7 +101,7 @@
ICD_EXPORT VK_RESULT VKAPI vkAllocMemory(
VK_DEVICE device,
- const VK_MEMORY_ALLOC_INFO* pAllocInfo,
+ const VkMemoryAllocInfo* pAllocInfo,
VK_GPU_MEMORY* pMem)
{
struct intel_dev *dev = intel_dev(device);
diff --git a/icd/intel/mem.h b/icd/intel/mem.h
index f81468c..b9398ae 100644
--- a/icd/intel/mem.h
+++ b/icd/intel/mem.h
@@ -40,7 +40,7 @@
};
VK_RESULT intel_mem_alloc(struct intel_dev *dev,
- const VK_MEMORY_ALLOC_INFO *info,
+ const VkMemoryAllocInfo *info,
struct intel_mem **mem_ret);
void intel_mem_free(struct intel_mem *mem);
diff --git a/icd/intel/obj.c b/icd/intel/obj.c
index 26a5dbd..c8daa35 100644
--- a/icd/intel/obj.c
+++ b/icd/intel/obj.c
@@ -115,11 +115,11 @@
break;
case VK_DBG_OBJECT_BUFFER:
assert(info.header->struct_type == VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO);
- shallow_copy = sizeof(VK_BUFFER_CREATE_INFO);
+ shallow_copy = sizeof(VkBufferCreateInfo);
break;
case VK_DBG_OBJECT_BUFFER_VIEW:
assert(info.header->struct_type == VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO);
- shallow_copy = sizeof(VK_BUFFER_VIEW_CREATE_INFO);
+ shallow_copy = sizeof(VkBufferViewCreateInfo);
break;
case VK_DBG_OBJECT_IMAGE:
assert(info.header->struct_type == VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO);
@@ -205,8 +205,8 @@
} else if (info.header->struct_type ==
VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO) {
size_t size;
- const VK_MEMORY_ALLOC_INFO *ptr_next, *src = info.ptr;
- VK_MEMORY_ALLOC_INFO *dst;
+ const VkMemoryAllocInfo *ptr_next, *src = info.ptr;
+ VkMemoryAllocInfo *dst;
uint8_t *d;
size = sizeof(*src);
@@ -214,15 +214,15 @@
while (ptr_next != NULL) {
switch (ptr_next->sType) {
case VK_STRUCTURE_TYPE_MEMORY_ALLOC_IMAGE_INFO:
- size += sizeof(VK_MEMORY_ALLOC_IMAGE_INFO);
+ size += sizeof(VkMemoryAllocImageInfo);
break;
case VK_STRUCTURE_TYPE_MEMORY_ALLOC_BUFFER_INFO:
- size += sizeof(VK_MEMORY_ALLOC_BUFFER_INFO);
+ size += sizeof(VkMemoryAllocBufferInfo);
break;
default:
return false;
}
- ptr_next = (VK_MEMORY_ALLOC_INFO *) ptr_next->pNext;
+ ptr_next = (VkMemoryAllocInfo *) ptr_next->pNext;
}
dbg->create_info_size = size;
dst = intel_alloc(handle, size, 0, VK_SYSTEM_ALLOC_DEBUG);
@@ -236,23 +236,23 @@
while (ptr_next != NULL) {
switch (ptr_next->sType) {
case VK_STRUCTURE_TYPE_MEMORY_ALLOC_IMAGE_INFO:
- memcpy(d, ptr_next, sizeof(VK_MEMORY_ALLOC_IMAGE_INFO));
- d += sizeof(VK_MEMORY_ALLOC_IMAGE_INFO);
+ memcpy(d, ptr_next, sizeof(VkMemoryAllocImageInfo));
+ d += sizeof(VkMemoryAllocImageInfo);
break;
case VK_STRUCTURE_TYPE_MEMORY_ALLOC_BUFFER_INFO:
- memcpy(d, ptr_next, sizeof(VK_MEMORY_ALLOC_BUFFER_INFO));
- d += sizeof(VK_MEMORY_ALLOC_BUFFER_INFO);
+ memcpy(d, ptr_next, sizeof(VkMemoryAllocBufferInfo));
+ d += sizeof(VkMemoryAllocBufferInfo);
break;
default:
return false;
}
- ptr_next = (VK_MEMORY_ALLOC_INFO *) ptr_next->pNext;
+ ptr_next = (VkMemoryAllocInfo *) ptr_next->pNext;
}
dbg->create_info = dst;
} else if (info.header->struct_type ==
VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO) {
- const VK_DEVICE_CREATE_INFO *src = info.ptr;
- VK_DEVICE_CREATE_INFO *dst;
+ const VkDeviceCreateInfo *src = info.ptr;
+ VkDeviceCreateInfo *dst;
uint8_t *d;
size_t size;
uint32_t i;
@@ -277,7 +277,7 @@
size = sizeof(src->pRequestedQueues[0]) * src->queueRecordCount;
memcpy(d, src->pRequestedQueues, size);
- dst->pRequestedQueues = (const VK_DEVICE_QUEUE_CREATE_INFO *) d;
+ dst->pRequestedQueues = (const VkDeviceQueueCreateInfo *) d;
d += size;
size = sizeof(src->ppEnabledExtensionNames[0]) * src->extensionCount;
diff --git a/icd/intel/view.c b/icd/intel/view.c
index 04ceb83..06059e6 100644
--- a/icd/intel/view.c
+++ b/icd/intel/view.c
@@ -1066,7 +1066,7 @@
}
VK_RESULT intel_buf_view_create(struct intel_dev *dev,
- const VK_BUFFER_VIEW_CREATE_INFO *info,
+ const VkBufferViewCreateInfo *info,
struct intel_buf_view **view_ret)
{
struct intel_buf *buf = intel_buf(info->buffer);
@@ -1323,7 +1323,7 @@
ICD_EXPORT VK_RESULT VKAPI vkCreateBufferView(
VK_DEVICE device,
- const VK_BUFFER_VIEW_CREATE_INFO* pCreateInfo,
+ const VkBufferViewCreateInfo* pCreateInfo,
VK_BUFFER_VIEW* pView)
{
struct intel_dev *dev = intel_dev(device);
diff --git a/icd/intel/view.h b/icd/intel/view.h
index 0d824b2..3f9ab4b 100644
--- a/icd/intel/view.h
+++ b/icd/intel/view.h
@@ -139,7 +139,7 @@
struct intel_dev *dev);
VK_RESULT intel_buf_view_create(struct intel_dev *dev,
- const VK_BUFFER_VIEW_CREATE_INFO *info,
+ const VkBufferViewCreateInfo *info,
struct intel_buf_view **view_ret);
void intel_buf_view_destroy(struct intel_buf_view *view);
diff --git a/icd/intel/wsi_x11.c b/icd/intel/wsi_x11.c
index 1575da4..94f3315 100644
--- a/icd/intel/wsi_x11.c
+++ b/icd/intel/wsi_x11.c
@@ -347,7 +347,7 @@
struct intel_img **img_ret)
{
VK_IMAGE_CREATE_INFO img_info;
- VK_MEMORY_ALLOC_INFO mem_info;
+ VkMemoryAllocInfo mem_info;
struct intel_img *img;
struct intel_mem *mem;
VK_RESULT ret;