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/tests/blit_tests.cpp b/tests/blit_tests.cpp
index 848fc83..b6dbc6d 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -778,9 +778,9 @@
// VK_RESULT VKAPI vkAllocMemory(
// VK_DEVICE device,
- // const VK_MEMORY_ALLOC_INFO* pAllocInfo,
+ // const VkMemoryAllocInfo* pAllocInfo,
// VK_GPU_MEMORY* pMem);
- VK_MEMORY_ALLOC_INFO mem_info;
+ VkMemoryAllocInfo mem_info;
VK_GPU_MEMORY event_mem;
ASSERT_NE(0, mem_req.size) << "vkGetObjectInfo (Event): Failed - expect events to require memory";
diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index 8898ae7..cf81836 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -93,7 +93,7 @@
this->app_info.pEngineName = "unittest";
this->app_info.engineVersion = 1;
this->app_info.apiVersion = VK_API_VERSION;
- VK_INSTANCE_CREATE_INFO inst_info = {};
+ VkInstanceCreateInfo inst_info = {};
inst_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
inst_info.pNext = NULL;
inst_info.pAppInfo = &app_info;
@@ -211,11 +211,11 @@
size_t img_reqs_size = sizeof(VK_IMAGE_MEMORY_REQUIREMENTS);
uint32_t num_allocations = 0;
size_t num_alloc_size = sizeof(num_allocations);
- VK_MEMORY_ALLOC_IMAGE_INFO img_alloc = {};
+ VkMemoryAllocImageInfo img_alloc = {};
img_alloc.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_IMAGE_INFO;
img_alloc.pNext = NULL;
- VK_MEMORY_ALLOC_INFO mem_info = {};
+ VkMemoryAllocInfo mem_info = {};
mem_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
mem_info.pNext = &img_alloc;
diff --git a/tests/init.cpp b/tests/init.cpp
index 9de9dfc..f40f435 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -98,7 +98,7 @@
this->app_info.pEngineName = "unittest";
this->app_info.engineVersion = 1;
this->app_info.apiVersion = VK_API_VERSION;
- VK_INSTANCE_CREATE_INFO inst_info = {};
+ VkInstanceCreateInfo inst_info = {};
inst_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
inst_info.pNext = NULL;
inst_info.pAppInfo = &app_info;
@@ -143,7 +143,7 @@
char *layers[16];
size_t layer_count;
char layer_buf[16][256];
- VK_INSTANCE_CREATE_INFO inst_info = {};
+ VkInstanceCreateInfo inst_info = {};
inst_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
inst_info.pNext = NULL;
inst_info.pAppInfo = &app_info;
@@ -184,7 +184,7 @@
TEST_F(XglTest, AllocMemory) {
VK_RESULT err;
- VK_MEMORY_ALLOC_INFO alloc_info = {};
+ VkMemoryAllocInfo alloc_info = {};
VK_GPU_MEMORY gpu_mem;
uint8_t *pData;
@@ -239,9 +239,9 @@
// VK_RESULT VKAPI vkAllocMemory(
// VK_DEVICE device,
- // const VK_MEMORY_ALLOC_INFO* pAllocInfo,
+ // const VkMemoryAllocInfo* pAllocInfo,
// VK_GPU_MEMORY* pMem);
- VK_MEMORY_ALLOC_INFO mem_info;
+ VkMemoryAllocInfo mem_info;
VK_GPU_MEMORY event_mem;
ASSERT_NE(0, mem_req.size) << "vkGetObjectInfo (Event): Failed - expect events to require memory";
@@ -371,9 +371,9 @@
// VK_RESULT VKAPI vkAllocMemory(
// VK_DEVICE device,
- // const VK_MEMORY_ALLOC_INFO* pAllocInfo,
+ // const VkMemoryAllocInfo* pAllocInfo,
// VK_GPU_MEMORY* pMem);
- VK_MEMORY_ALLOC_INFO mem_info;
+ VkMemoryAllocInfo mem_info;
VK_GPU_MEMORY query_mem;
memset(&mem_info, 0, sizeof(mem_info));
@@ -638,7 +638,7 @@
subresource.mipLevel++;
}
- VK_MEMORY_ALLOC_IMAGE_INFO img_alloc = {
+ VkMemoryAllocImageInfo img_alloc = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_IMAGE_INFO,
.pNext = NULL,
@@ -661,9 +661,9 @@
img_alloc.samples = img_reqs.samples;
// VK_RESULT VKAPI vkAllocMemory(
// VK_DEVICE device,
- // const VK_MEMORY_ALLOC_INFO* pAllocInfo,
+ // const VkMemoryAllocInfo* pAllocInfo,
// VK_GPU_MEMORY* pMem);
- VK_MEMORY_ALLOC_INFO mem_info = {};
+ VkMemoryAllocInfo mem_info = {};
VK_GPU_MEMORY image_mem;
mem_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
diff --git a/tests/test_environment.cpp b/tests/test_environment.cpp
index 5d3a580..d2a22ef 100644
--- a/tests/test_environment.cpp
+++ b/tests/test_environment.cpp
@@ -51,7 +51,7 @@
uint32_t count;
VK_RESULT err;
- VK_INSTANCE_CREATE_INFO inst_info = {};
+ VkInstanceCreateInfo inst_info = {};
inst_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
inst_info.pNext = NULL;
inst_info.pAppInfo = &app_;
@@ -82,7 +82,7 @@
const xcb_setup_t *setup;
xcb_screen_iterator_t iter;
int scr;
- VK_INSTANCE_CREATE_INFO instInfo = {};
+ VkInstanceCreateInfo instInfo = {};
instInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
instInfo.pNext = NULL;
instInfo.pAppInfo = &app_;
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 9d38aa2..a130f13 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -59,7 +59,7 @@
void VkRenderFramework::InitFramework()
{
VK_RESULT err;
- VK_INSTANCE_CREATE_INFO instInfo = {};
+ VkInstanceCreateInfo instInfo = {};
instInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
instInfo.pNext = NULL;
instInfo.pAppInfo = &app_info;
@@ -765,7 +765,7 @@
unmap();
// set up the buffer view for the constant buffer
- VK_BUFFER_VIEW_CREATE_INFO view_info = {};
+ VkBufferViewCreateInfo view_info = {};
view_info.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO;
view_info.buffer = obj();
view_info.viewType = VK_BUFFER_VIEW_RAW;
@@ -896,7 +896,7 @@
unmap();
// set up the buffer view for the constant buffer
- VK_BUFFER_VIEW_CREATE_INFO view_info = {};
+ VkBufferViewCreateInfo view_info = {};
view_info.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO;
view_info.buffer = obj();
view_info.viewType = VK_BUFFER_VIEW_TYPED;
diff --git a/tests/vktestbinding.cpp b/tests/vktestbinding.cpp
index fcadfd9..2f525dc 100644
--- a/tests/vktestbinding.cpp
+++ b/tests/vktestbinding.cpp
@@ -267,15 +267,15 @@
const std::vector<VK_MEMORY_REQUIREMENTS> mem_reqs = memory_requirements();
std::vector<VK_IMAGE_MEMORY_REQUIREMENTS> img_reqs;
std::vector<VK_BUFFER_MEMORY_REQUIREMENTS> buf_reqs;
- VK_MEMORY_ALLOC_IMAGE_INFO img_info;
- VK_MEMORY_ALLOC_BUFFER_INFO buf_info;
- VK_MEMORY_ALLOC_INFO info, *next_info = NULL;
+ VkMemoryAllocImageInfo img_info;
+ VkMemoryAllocBufferInfo buf_info;
+ VkMemoryAllocInfo info, *next_info = NULL;
if (for_img) {
img_reqs = get_info<VK_IMAGE_MEMORY_REQUIREMENTS>(obj(),
VK_INFO_TYPE_IMAGE_MEMORY_REQUIREMENTS, 0);
EXPECT(img_reqs.size() == 1);
- next_info = (VK_MEMORY_ALLOC_INFO *) &img_info;
+ next_info = (VkMemoryAllocInfo *) &img_info;
img_info.pNext = NULL;
img_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_IMAGE_INFO;
img_info.usage = img_reqs[0].usage;
@@ -290,7 +290,7 @@
if (for_img)
img_info.pNext = &buf_info;
else
- next_info = (VK_MEMORY_ALLOC_INFO *) &buf_info;
+ next_info = (VkMemoryAllocInfo *) &buf_info;
buf_info.pNext = NULL;
buf_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_BUFFER_INFO;
buf_info.usage = buf_reqs[0].usage;
@@ -368,10 +368,10 @@
{
// request all queues
const std::vector<VK_PHYSICAL_GPU_QUEUE_PROPERTIES> queue_props = gpu_.queue_properties();
- std::vector<VK_DEVICE_QUEUE_CREATE_INFO> queue_info;
+ std::vector<VkDeviceQueueCreateInfo> queue_info;
queue_info.reserve(queue_props.size());
for (int i = 0; i < queue_props.size(); i++) {
- VK_DEVICE_QUEUE_CREATE_INFO qi = {};
+ VkDeviceQueueCreateInfo qi = {};
qi.queueNodeIndex = i;
qi.queueCount = queue_props[i].queueCount;
if (queue_props[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) {
@@ -380,7 +380,7 @@
queue_info.push_back(qi);
}
- VK_LAYER_CREATE_INFO layer_info = {};
+ VkLayerCreateInfo layer_info = {};
layer_info.sType = VK_STRUCTURE_TYPE_LAYER_CREATE_INFO;
std::vector<const char *> layers;
@@ -394,7 +394,7 @@
const std::vector<const char *> exts = gpu_.extensions();
- VK_DEVICE_CREATE_INFO dev_info = {};
+ VkDeviceCreateInfo dev_info = {};
dev_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
dev_info.pNext = (enable_layers) ? static_cast<void *>(&layer_info) : NULL;
dev_info.queueRecordCount = queue_info.size();
@@ -407,7 +407,7 @@
init(dev_info);
}
-void Device::init(const VK_DEVICE_CREATE_INFO &info)
+void Device::init(const VkDeviceCreateInfo &info)
{
DERIVED_OBJECT_INIT(vkCreateDevice, gpu_.obj(), &info);
@@ -565,7 +565,7 @@
EXPECT(vkFreeMemory(obj()) == VK_SUCCESS);
}
-void GpuMemory::init(const Device &dev, const VK_MEMORY_ALLOC_INFO &info)
+void GpuMemory::init(const Device &dev, const VkMemoryAllocInfo &info)
{
DERIVED_OBJECT_INIT(vkAllocMemory, dev.obj(), &info);
}
@@ -666,19 +666,19 @@
return err;
}
-void Buffer::init(const Device &dev, const VK_BUFFER_CREATE_INFO &info)
+void Buffer::init(const Device &dev, const VkBufferCreateInfo &info)
{
init_no_mem(dev, info);
alloc_memory(dev, true, false);
}
-void Buffer::init_no_mem(const Device &dev, const VK_BUFFER_CREATE_INFO &info)
+void Buffer::init_no_mem(const Device &dev, const VkBufferCreateInfo &info)
{
DERIVED_OBJECT_INIT(vkCreateBuffer, dev.obj(), &info);
create_info_ = info;
}
-void BufferView::init(const Device &dev, const VK_BUFFER_VIEW_CREATE_INFO &info)
+void BufferView::init(const Device &dev, const VkBufferViewCreateInfo &info)
{
DERIVED_OBJECT_INIT(vkCreateBufferView, dev.obj(), &info);
alloc_memory(dev);
diff --git a/tests/vktestbinding.h b/tests/vktestbinding.h
index 4068e75..39159eb 100644
--- a/tests/vktestbinding.h
+++ b/tests/vktestbinding.h
@@ -200,7 +200,7 @@
~Device();
// vkCreateDevice()
- void init(const VK_DEVICE_CREATE_INFO &info);
+ void init(const VkDeviceCreateInfo &info);
void init(bool enable_layers); // all queues, all extensions, etc
void init() { init(false); };
@@ -278,7 +278,7 @@
~GpuMemory();
// vkAllocMemory()
- void init(const Device &dev, const VK_MEMORY_ALLOC_INFO &info);
+ void init(const Device &dev, const VkMemoryAllocInfo &info);
// vkPinSystemMemory()
void init(const Device &dev, size_t size, const void *data);
// vkOpenSharedMemory()
@@ -300,8 +300,8 @@
// vkUnmapMemory()
void unmap() const;
- static VK_MEMORY_ALLOC_INFO alloc_info(const VK_MEMORY_REQUIREMENTS &reqs,
- const VK_MEMORY_ALLOC_INFO *next_info);
+ static VkMemoryAllocInfo alloc_info(const VK_MEMORY_REQUIREMENTS &reqs,
+ const VkMemoryAllocInfo *next_info);
};
class Fence : public DerivedObject<VK_FENCE, Object> {
@@ -355,15 +355,15 @@
class Buffer : public DerivedObject<VK_BUFFER, Object> {
public:
explicit Buffer() {}
- explicit Buffer(const Device &dev, const VK_BUFFER_CREATE_INFO &info) { init(dev, info); }
+ explicit Buffer(const Device &dev, const VkBufferCreateInfo &info) { init(dev, info); }
explicit Buffer(const Device &dev, VK_GPU_SIZE size) { init(dev, size); }
// vkCreateBuffer()
- void init(const Device &dev, const VK_BUFFER_CREATE_INFO &info);
+ void init(const Device &dev, const VkBufferCreateInfo &info);
void init(const Device &dev, VK_GPU_SIZE size) { init(dev, create_info(size, 0)); }
- void init_no_mem(const Device &dev, const VK_BUFFER_CREATE_INFO &info);
+ void init_no_mem(const Device &dev, const VkBufferCreateInfo &info);
- static VK_BUFFER_CREATE_INFO create_info(VK_GPU_SIZE size, VK_FLAGS usage);
+ static VkBufferCreateInfo create_info(VK_GPU_SIZE size, VK_FLAGS usage);
VK_BUFFER_MEMORY_BARRIER buffer_memory_barrier(VK_FLAGS output_mask, VK_FLAGS input_mask,
VK_GPU_SIZE offset, VK_GPU_SIZE size) const
@@ -378,13 +378,13 @@
return barrier;
}
private:
- VK_BUFFER_CREATE_INFO create_info_;
+ VkBufferCreateInfo create_info_;
};
class BufferView : public DerivedObject<VK_BUFFER_VIEW, Object> {
public:
// vkCreateBufferView()
- void init(const Device &dev, const VK_BUFFER_VIEW_CREATE_INFO &info);
+ void init(const Device &dev, const VkBufferViewCreateInfo &info);
};
class Image : public DerivedObject<VK_IMAGE, Object> {
@@ -618,10 +618,10 @@
primary_mem_->unmap();
}
-inline VK_MEMORY_ALLOC_INFO GpuMemory::alloc_info(const VK_MEMORY_REQUIREMENTS &reqs,
- const VK_MEMORY_ALLOC_INFO *next_info)
+inline VkMemoryAllocInfo GpuMemory::alloc_info(const VK_MEMORY_REQUIREMENTS &reqs,
+ const VkMemoryAllocInfo *next_info)
{
- VK_MEMORY_ALLOC_INFO info = {};
+ VkMemoryAllocInfo info = {};
info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
if (next_info != NULL)
info.pNext = (void *) next_info;
@@ -633,9 +633,9 @@
return info;
}
-inline VK_BUFFER_CREATE_INFO Buffer::create_info(VK_GPU_SIZE size, VK_FLAGS usage)
+inline VkBufferCreateInfo Buffer::create_info(VK_GPU_SIZE size, VK_FLAGS usage)
{
- VK_BUFFER_CREATE_INFO info = {};
+ VkBufferCreateInfo info = {};
info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
info.size = size;
info.usage = usage;