bug 14921 part 1: sed renames
Workaround header bug (ALLOC_INFO vs AllocateInfo) in vk_helper.py. This
affects the debug extensions as well.
s/NONDISP/NON_DISPATCHABLE/g
s/CmdBuffer/CommandBuffer/g
s/cmdBuffer/commandBuffer/g
s/CMD_BUFFER/COMMAND_BUFFER/g
s/AllocMemory/AllocateMemory/g
s/AllocDescriptorSets/AllocateDescriptorSets/g
s/AllocCommandBuffers/AllocateCommandBuffers/g
s/VkAllocCallbacks/VkAllocationCallbacks/g
s/VkSystemAllocScope/VkSystemAllocationScope/g
s/allocScope/allocationScope/g
s/allocType/allocationType/g
s/pfnAlloc\b/pfnAllocation/g
s/pfnRealloc\b/pfnReallocation/g
s/VK_SYSTEM_ALLOC_/VK_SYSTEM_ALLOCATION_/g
s/extName/extensionName/g
s/implVersion/implementationVersion/g
s/pAppInfo/pApplicationInfo/g
s/pMem\b/pMemory/g
s/VkMemoryAllocInfo/VkMemoryAllocateInfo/g
s/VkDescriptorSetAllocInfo/VkDescriptorSetAllocateInfo/g
s/CmdPool/CommandPool/g
s/cmdPool/commandPool/g
s/CMD_POOL/COMMAND_POOL/g
s/VkCommandBufferAllocInfo/VkCommandBufferAllocateInfo/g
s/maxTessellationGenLevel/maxTessellationGenerationLevel/g
s/maxFragmentDualSourceAttachments/maxFragmentDualSrcAttachments/g
s/destSubpass/dstSubpass/g
s/destStageMask/dstStageMask/g
s/dualSourceBlend/dualSrcBlend/g
s/destBlendColor/dstBlendColor/g
s/destBlendAlpha/dstBlendAlpha/g
s/VK_FORMAT_NUM/VK_FORMAT_RANGE_SIZE/g
s/VK_DYNAMIC_STATE_NUM/VK_DYNAMIC_STATE_RANGE_SIZE/g
s/pAppName/pApplicationName/g
s/appVersion/applicationVersion/g
s/numLevels/levelCount/g
s/numLayers/layerCount/g
s/destOffset/dstOffset/g
s/destSubresource/dstSubresource/g
s/VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL/VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL/g
s/VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL/VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL/g
s/VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT/VK_IMAGE_USAGE_TRANSFER_SRC_BIT/g
s/VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT/VK_IMAGE_USAGE_TRANSFER_DST_BIT/g
s/destBuffer/dstBuffer/g
s/destQueueFamilyIndex/dstQueueFamilyIndex/g
s/destSet/dstSet/g
s/destBinding/dstBinding/g
s/destArrayElement/dstArrayElement/g
s/VK_BLEND_DEST_COLOR/VK_BLEND_DST_COLOR/g
s/VK_BLEND_ONE_MINUS_DEST_COLOR/VK_BLEND_ONE_MINUS_DST_COLOR/g
s/VK_BLEND_DEST_ALPHA/VK_BLEND_DST_ALPHA/g
s/VK_BLEND_ONE_MINUS_DEST_ALPHA/VK_BLEND_ONE_MINUS_DST_ALPHA/g
s/VK_FORMAT_FEATURE_BLIT_SOURCE_BIT/VK_FORMAT_FEATURE_BLIT_SRC_BIT/g
s/VK_FORMAT_FEATURE_BLIT_DESTINATION_BIT/VK_FORMAT_FEATURE_BLIT_DST_BIT/g
s/VK_BUFFER_USAGE_TRANSFER_SOURCE_BIT/VK_BUFFER_USAGE_TRANSFER_SRC_BIT/g
s/VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT/VK_BUFFER_USAGE_TRANSFER_DST_BIT/g
s/VK_COMPARE_OP_LESS_EQUAL/VK_COMPARE_OP_LESS_OR_EQUAL/g
s/VK_COMPARE_OP_GREATER_EQUAL/VK_COMPARE_OP_GREATER_OR_EQUAL/g
s/VkPipelineRasterStateCreateInfo/VkPipelineRasterizationStateCreateInfo/g
s/rasterSamples/rasterizationSamples/g
s/pRasterState/pRasterizationState/g
s/VK_FRONT_FACE_CCW/VK_FRONT_FACE_COUNTER_CLOCKWISE/g
s/VK_FRONT_FACE_CW/VK_FRONT_FACE_CLOCKWISE/g
s/VK_PRIMITIVE_TOPOLOGY_LINE_LIST_ADJ/VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY/g
s/VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_ADJ/VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_WITH_ADJACENCY/g
s/VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_ADJ/VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY/g
s/VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_ADJ/VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_WITH_ADJACENCY/g
s/VK_STENCIL_OP_INC_CLAMP/VK_STENCIL_OP_INCREMENT_AND_CLAMP/g
s/VK_STENCIL_OP_DEC_CLAMP/VK_STENCIL_OP_DECREMENT_AND_CLAMP/g
s/VK_STENCIL_OP_INC_WRAP/VK_STENCIL_OP_INCREMENT_AND_WRAP/g
s/VK_STENCIL_OP_DEC_WRAP/VK_STENCIL_OP_DECREMENT_AND_WRAP/g
s/VK_LOGIC_OP_NOOP/VK_LOGIC_OP_NO_OP/g
s/VK_LOGIC_OP_EQUIV\b/VK_LOGIC_OP_EQUIVALENT/g
s/memBarrierCount/memoryBarrierCount/g
s/ppMemBarriers/ppMemoryBarriers/g
s/destImage/dstImage/g
s/destImageLayout/dstImageLayout/g
s/destCache/dstCache/g
s/memOffset/memoryOffset/g
s/vk_print_vkmemoryallocinfo/vk_print_vkmemoryallocateinfo/g
s/pAllocInfo/pAllocateInfo/g
s/memRangeCount/memoryRangeCount/g
s/pMemRanges/pMemoryRanges/g
s/VK_IMAGE_TYPE_NUM/VK_IMAGE_TYPE_RANGE_SIZE/g
s/VK_PIPELINE_BIND_POINT_NUM/VK_PIPELINE_BIND_POINT_RANGE_SIZE/g
s/vk_size_vkdescriptorsetallocinfo/vk_size_vkdescriptorsetallocateinfo/g
s/remap_cmdbuffers/remap_commandbuffers/g
s/remap_cmdpool/remap_commandpool/g
s/add_to_cmdbuffers_map/add_to_commandbuffers_map/g
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14921
a
diff --git a/demos/cube.c b/demos/cube.c
index be5d1b5..33583bb 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -106,7 +106,7 @@
VkImage image;
VkImageLayout imageLayout;
- VkMemoryAllocInfo mem_alloc;
+ VkMemoryAllocateInfo mem_alloc;
VkDeviceMemory mem;
VkImageView view;
int32_t tex_width, tex_height;
@@ -302,7 +302,7 @@
typedef struct _SwapchainBuffers {
VkImage image;
- VkCmdBuffer cmd;
+ VkCommandBuffer cmd;
VkImageView view;
} SwapchainBuffers;
@@ -350,13 +350,13 @@
VkSwapchainKHR swapchain;
SwapchainBuffers *buffers;
- VkCmdPool cmd_pool;
+ VkCommandPool cmd_pool;
struct {
VkFormat format;
VkImage image;
- VkMemoryAllocInfo mem_alloc;
+ VkMemoryAllocateInfo mem_alloc;
VkDeviceMemory mem;
VkImageView view;
} depth;
@@ -365,12 +365,12 @@
struct {
VkBuffer buf;
- VkMemoryAllocInfo mem_alloc;
+ VkMemoryAllocateInfo mem_alloc;
VkDeviceMemory mem;
VkDescriptorBufferInfo buffer_info;
} uniform_data;
- VkCmdBuffer cmd; // Buffer for initialization commands
+ VkCommandBuffer cmd; // Buffer for initialization commands
VkPipelineLayout pipeline_layout;
VkDescriptorSetLayout desc_layout;
VkPipelineCache pipelineCache;
@@ -437,7 +437,7 @@
err = vkEndCommandBuffer(demo->cmd);
assert(!err);
- const VkCmdBuffer cmd_bufs[] = { demo->cmd };
+ const VkCommandBuffer cmd_bufs[] = { demo->cmd };
VkFence nullFence = VK_NULL_HANDLE;
VkSubmitInfo submit_info = {
.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
@@ -470,19 +470,19 @@
VkResult U_ASSERT_ONLY err;
if (demo->cmd == VK_NULL_HANDLE) {
- const VkCmdBufferAllocInfo cmd = {
- .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_ALLOC_INFO,
+ const VkCommandBufferAllocateInfo cmd = {
+ .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO,
.pNext = NULL,
- .cmdPool = demo->cmd_pool,
- .level = VK_CMD_BUFFER_LEVEL_PRIMARY,
+ .commandPool = demo->cmd_pool,
+ .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY,
.bufferCount = 1,
};
- err = vkAllocCommandBuffers(demo->device, &cmd, &demo->cmd);
+ err = vkAllocateCommandBuffers(demo->device, &cmd, &demo->cmd);
assert(!err);
- VkCmdBufferBeginInfo cmd_buf_info = {
- .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO,
+ VkCommandBufferBeginInfo cmd_buf_info = {
+ .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
.pNext = NULL,
.flags = 0,
.renderPass = VK_NULL_HANDLE,
@@ -504,7 +504,7 @@
.subresourceRange = { aspectMask, 0, 1, 0, 0 }
};
- if (new_image_layout == VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL) {
+ if (new_image_layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) {
/* Make sure anything that was copying from this image has completed */
image_memory_barrier.inputMask = VK_MEMORY_INPUT_TRANSFER_BIT;
}
@@ -522,10 +522,10 @@
vkCmdPipelineBarrier(demo->cmd, src_stages, dest_stages, 0, 1, (const void * const*)&pmemory_barrier);
}
-static void demo_draw_build_cmd(struct demo *demo, VkCmdBuffer cmd_buf)
+static void demo_draw_build_cmd(struct demo *demo, VkCommandBuffer cmd_buf)
{
- const VkCmdBufferBeginInfo cmd_buf_info = {
- .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO,
+ const VkCommandBufferBeginInfo cmd_buf_info = {
+ .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
.pNext = NULL,
.flags = 0,
.renderPass = VK_NULL_HANDLE,
@@ -587,7 +587,7 @@
.oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
.newLayout = VK_IMAGE_LAYOUT_PRESENT_SOURCE_KHR,
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
- .destQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+ .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
.subresourceRange = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
};
@@ -854,9 +854,9 @@
.subresourceRange = {
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
.baseMipLevel = 0,
- .numLevels = 1,
+ .levelCount = 1,
.baseArrayLayer = 0,
- .numLayers = 1
+ .layerCount = 1
},
.viewType = VK_IMAGE_VIEW_TYPE_2D,
.flags = 0,
@@ -904,9 +904,9 @@
.subresourceRange = {
.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT,
.baseMipLevel = 0,
- .numLevels = 1,
+ .levelCount = 1,
.baseArrayLayer = 0,
- .numLayers = 1
+ .layerCount = 1
},
.flags = 0,
.viewType = VK_IMAGE_VIEW_TYPE_2D,
@@ -939,7 +939,7 @@
assert(pass);
/* allocate memory */
- err = vkAllocMemory(demo->device, &demo->depth.mem_alloc,
+ err = vkAllocateMemory(demo->device, &demo->depth.mem_alloc,
NULL, &demo->depth.mem);
assert(!err);
@@ -1064,7 +1064,7 @@
assert(pass);
/* allocate memory */
- err = vkAllocMemory(demo->device, &tex_obj->mem_alloc, NULL,
+ err = vkAllocateMemory(demo->device, &tex_obj->mem_alloc, NULL,
&(tex_obj->mem));
assert(!err);
@@ -1130,38 +1130,38 @@
memset(&staging_texture, 0, sizeof(staging_texture));
demo_prepare_texture_image(demo, tex_files[i], &staging_texture,
- VK_IMAGE_TILING_LINEAR, VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
+ VK_IMAGE_TILING_LINEAR, VK_IMAGE_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
demo_prepare_texture_image(demo, tex_files[i], &demo->textures[i],
VK_IMAGE_TILING_OPTIMAL,
- (VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT | VK_IMAGE_USAGE_SAMPLED_BIT),
+ (VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT),
VK_MEMORY_PROPERTY_DEVICE_ONLY);
demo_set_image_layout(demo, staging_texture.image,
VK_IMAGE_ASPECT_COLOR_BIT,
staging_texture.imageLayout,
- VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL);
+ VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
demo_set_image_layout(demo, demo->textures[i].image,
VK_IMAGE_ASPECT_COLOR_BIT,
demo->textures[i].imageLayout,
- VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL);
+ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
VkImageCopy copy_region = {
.srcSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 },
.srcOffset = { 0, 0, 0 },
- .destSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 },
- .destOffset = { 0, 0, 0 },
+ .dstSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 },
+ .dstOffset = { 0, 0, 0 },
.extent = { staging_texture.tex_width, staging_texture.tex_height, 1 },
};
vkCmdCopyImage(demo->cmd,
- staging_texture.image, VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL,
- demo->textures[i].image, VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL,
+ staging_texture.image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+ demo->textures[i].image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
1, ©_region);
demo_set_image_layout(demo, demo->textures[i].image,
VK_IMAGE_ASPECT_COLOR_BIT,
- VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL,
+ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
demo->textures[i].imageLayout);
demo_flush_init_cmd(demo);
@@ -1265,7 +1265,7 @@
&demo->uniform_data.mem_alloc.memoryTypeIndex);
assert(pass);
- err = vkAllocMemory(demo->device, &demo->uniform_data.mem_alloc,
+ err = vkAllocateMemory(demo->device, &demo->uniform_data.mem_alloc,
NULL, &(demo->uniform_data.mem));
assert(!err);
@@ -1554,12 +1554,12 @@
VkPipelineCacheCreateInfo pipelineCache;
VkPipelineVertexInputStateCreateInfo vi;
VkPipelineInputAssemblyStateCreateInfo ia;
- VkPipelineRasterStateCreateInfo rs;
+ VkPipelineRasterizationStateCreateInfo rs;
VkPipelineColorBlendStateCreateInfo cb;
VkPipelineDepthStencilStateCreateInfo ds;
VkPipelineViewportStateCreateInfo vp;
VkPipelineMultisampleStateCreateInfo ms;
- VkDynamicState dynamicStateEnables[VK_DYNAMIC_STATE_NUM];
+ VkDynamicState dynamicStateEnables[VK_DYNAMIC_STATE_RANGE_SIZE];
VkPipelineDynamicStateCreateInfo dynamicState;
VkResult U_ASSERT_ONLY err;
@@ -1583,7 +1583,7 @@
rs.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO;
rs.fillMode = VK_FILL_MODE_SOLID;
rs.cullMode = VK_CULL_MODE_BACK_BIT;
- rs.frontFace = VK_FRONT_FACE_CCW;
+ rs.frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE;
rs.depthClampEnable = VK_FALSE;
rs.rasterizerDiscardEnable = VK_FALSE;
rs.depthBiasEnable = VK_FALSE;
@@ -1608,7 +1608,7 @@
ds.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
ds.depthTestEnable = VK_TRUE;
ds.depthWriteEnable = VK_TRUE;
- ds.depthCompareOp = VK_COMPARE_OP_LESS_EQUAL;
+ ds.depthCompareOp = VK_COMPARE_OP_LESS_OR_EQUAL;
ds.depthBoundsTestEnable = VK_FALSE;
ds.back.stencilFailOp = VK_STENCIL_OP_KEEP;
ds.back.stencilPassOp = VK_STENCIL_OP_KEEP;
@@ -1619,7 +1619,7 @@
memset(&ms, 0, sizeof(ms));
ms.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
ms.pSampleMask = NULL;
- ms.rasterSamples = 1;
+ ms.rasterizationSamples = 1;
// Two stages: vs and fs
pipeline.stageCount = 2;
@@ -1640,7 +1640,7 @@
pipeline.pVertexInputState = &vi;
pipeline.pInputAssemblyState = &ia;
- pipeline.pRasterState = &rs;
+ pipeline.pRasterizationState = &rs;
pipeline.pColorBlendState = &cb;
pipeline.pMultisampleState = &ms;
pipeline.pViewportState = &vp;
@@ -1695,14 +1695,14 @@
VkResult U_ASSERT_ONLY err;
uint32_t i;
- VkDescriptorSetAllocInfo alloc_info = {
+ VkDescriptorSetAllocateInfo alloc_info = {
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO,
.pNext = NULL,
.descriptorPool = demo->desc_pool,
.setLayoutCount = 1,
.pSetLayouts = &demo->desc_layout
};
- err = vkAllocDescriptorSets(demo->device, &alloc_info, &demo->desc_set);
+ err = vkAllocateDescriptorSets(demo->device, &alloc_info, &demo->desc_set);
assert(!err);
memset(&tex_descs, 0, sizeof(tex_descs));
@@ -1715,14 +1715,14 @@
memset(&writes, 0, sizeof(writes));
writes[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
- writes[0].destSet = demo->desc_set;
+ writes[0].dstSet = demo->desc_set;
writes[0].descriptorCount = 1;
writes[0].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
writes[0].pBufferInfo = &demo->uniform_data.buffer_info;
writes[1].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
- writes[1].destSet = demo->desc_set;
- writes[1].destBinding = 1;
+ writes[1].dstSet = demo->desc_set;
+ writes[1].dstBinding = 1;
writes[1].descriptorCount = DEMO_TEXTURE_COUNT;
writes[1].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
writes[1].pImageInfo = tex_descs;
@@ -1762,8 +1762,8 @@
{
VkResult U_ASSERT_ONLY err;
- const VkCmdPoolCreateInfo cmd_pool_info = {
- .sType = VK_STRUCTURE_TYPE_CMD_POOL_CREATE_INFO,
+ const VkCommandPoolCreateInfo cmd_pool_info = {
+ .sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO,
.pNext = NULL,
.queueFamilyIndex = demo->graphics_queue_node_index,
.flags = 0,
@@ -1771,11 +1771,11 @@
err = vkCreateCommandPool(demo->device, &cmd_pool_info, NULL, &demo->cmd_pool);
assert(!err);
- const VkCmdBufferAllocInfo cmd = {
- .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_ALLOC_INFO,
+ const VkCommandBufferAllocateInfo cmd = {
+ .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO,
.pNext = NULL,
- .cmdPool = demo->cmd_pool,
- .level = VK_CMD_BUFFER_LEVEL_PRIMARY,
+ .commandPool = demo->cmd_pool,
+ .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY,
.bufferCount = 1,
};
@@ -1789,7 +1789,7 @@
demo_prepare_pipeline(demo);
for (uint32_t i = 0; i < demo->swapchainImageCount; i++) {
- err = vkAllocCommandBuffers(demo->device, &cmd, &demo->buffers[i].cmd);
+ err = vkAllocateCommandBuffers(demo->device, &cmd, &demo->buffers[i].cmd);
assert(!err);
}
@@ -2237,11 +2237,11 @@
err = vkEnumerateInstanceExtensionProperties(NULL, &instance_extension_count, instance_extensions);
assert(!err);
for (uint32_t i = 0; i < instance_extension_count; i++) {
- if (!strcmp("VK_EXT_KHR_swapchain", instance_extensions[i].extName)) {
+ if (!strcmp("VK_EXT_KHR_swapchain", instance_extensions[i].extensionName)) {
swapchainExtFound = 1;
extension_names[enabled_extension_count++] = "VK_EXT_KHR_swapchain";
}
- if (!strcmp(VK_DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extName)) {
+ if (!strcmp(VK_DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extensionName)) {
if (demo->validate) {
extension_names[enabled_extension_count++] = VK_DEBUG_REPORT_EXTENSION_NAME;
}
@@ -2259,8 +2259,8 @@
const VkApplicationInfo app = {
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
.pNext = NULL,
- .pAppName = APP_SHORT_NAME,
- .appVersion = 0,
+ .pApplicationName = APP_SHORT_NAME,
+ .applicationVersion = 0,
.pEngineName = APP_SHORT_NAME,
.engineVersion = 0,
.apiVersion = VK_API_VERSION,
@@ -2268,7 +2268,7 @@
VkInstanceCreateInfo inst_info = {
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
.pNext = NULL,
- .pAppInfo = &app,
+ .pApplicationInfo = &app,
.enabledLayerNameCount = enabled_layer_count,
.ppEnabledLayerNames = (const char *const*) ((demo->validate) ? instance_validation_layers : NULL),
.enabledExtensionNameCount = enabled_extension_count,
@@ -2346,7 +2346,7 @@
assert(!err);
for (uint32_t i = 0; i < device_extension_count; i++) {
- if (!strcmp("VK_EXT_KHR_device_swapchain", device_extensions[i].extName)) {
+ if (!strcmp("VK_EXT_KHR_device_swapchain", device_extensions[i].extensionName)) {
swapchainExtFound = 1;
extension_names[enabled_extension_count++] = "VK_EXT_KHR_device_swapchain";
}
diff --git a/demos/tri.c b/demos/tri.c
index a5c30e3..a5159a2 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -148,7 +148,7 @@
typedef struct _SwapchainBuffers {
VkImage image;
- VkCmdBuffer cmd;
+ VkCommandBuffer cmd;
VkImageView view;
} SwapchainBuffers;
@@ -169,7 +169,7 @@
bool use_staging_buffer;
bool use_glsl;
- VkAllocCallbacks allocator;
+ VkAllocationCallbacks allocator;
VkInstance inst;
VkPhysicalDevice gpu;
@@ -197,7 +197,7 @@
VkSwapchainKHR swapchain;
SwapchainBuffers *buffers;
- VkCmdPool cmd_pool;
+ VkCommandPool cmd_pool;
struct {
VkFormat format;
@@ -218,8 +218,8 @@
VkVertexInputAttributeDescription vi_attrs[2];
} vertices;
- VkCmdBuffer setup_cmd; // Command Buffer for initialization commands
- VkCmdBuffer draw_cmd; // Command Buffer for drawing commands
+ VkCommandBuffer setup_cmd; // Command Buffer for initialization commands
+ VkCommandBuffer draw_cmd; // Command Buffer for drawing commands
VkPipelineLayout pipeline_layout;
VkDescriptorSetLayout desc_layout;
VkPipelineCache pipelineCache;
@@ -279,7 +279,7 @@
err = vkEndCommandBuffer(demo->setup_cmd);
assert(!err);
- const VkCmdBuffer cmd_bufs[] = { demo->setup_cmd };
+ const VkCommandBuffer cmd_bufs[] = { demo->setup_cmd };
VkFence nullFence = {VK_NULL_HANDLE};
VkSubmitInfo submit_info = {
.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
@@ -312,19 +312,19 @@
VkResult U_ASSERT_ONLY err;
if (demo->setup_cmd == VK_NULL_HANDLE) {
- const VkCmdBufferAllocInfo cmd = {
- .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_ALLOC_INFO,
+ const VkCommandBufferAllocateInfo cmd = {
+ .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO,
.pNext = NULL,
- .cmdPool = demo->cmd_pool,
- .level = VK_CMD_BUFFER_LEVEL_PRIMARY,
+ .commandPool = demo->cmd_pool,
+ .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY,
.bufferCount = 1,
};
- err = vkAllocCommandBuffers(demo->device, &cmd, &demo->setup_cmd);
+ err = vkAllocateCommandBuffers(demo->device, &cmd, &demo->setup_cmd);
assert(!err);
- VkCmdBufferBeginInfo cmd_buf_info = {
- .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO,
+ VkCommandBufferBeginInfo cmd_buf_info = {
+ .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
.pNext = NULL,
.flags = 0,
.renderPass = VK_NULL_HANDLE,
@@ -346,7 +346,7 @@
.subresourceRange = { aspectMask, 0, 1, 0, 0 }
};
- if (new_image_layout == VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL) {
+ if (new_image_layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) {
/* Make sure anything that was copying from this image has completed */
image_memory_barrier.inputMask = VK_MEMORY_INPUT_TRANSFER_BIT;
}
@@ -366,8 +366,8 @@
static void demo_draw_build_cmd(struct demo *demo)
{
- const VkCmdBufferBeginInfo cmd_buf_info = {
- .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO,
+ const VkCommandBufferBeginInfo cmd_buf_info = {
+ .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
.pNext = NULL,
.flags = 0,
.renderPass = VK_NULL_HANDLE,
@@ -431,7 +431,7 @@
.oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
.newLayout = VK_IMAGE_LAYOUT_PRESENT_SOURCE_KHR,
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
- .destQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+ .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
.subresourceRange = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }
};
@@ -662,9 +662,9 @@
.subresourceRange = {
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
.baseMipLevel = 0,
- .numLevels = 1,
+ .levelCount = 1,
.baseArrayLayer = 0,
- .numLayers = 1
+ .layerCount = 1
},
.viewType = VK_IMAGE_VIEW_TYPE_2D,
.flags = 0,
@@ -705,7 +705,7 @@
.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT,
.flags = 0,
};
- VkMemoryAllocInfo mem_alloc = {
+ VkMemoryAllocateInfo mem_alloc = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
.pNext = NULL,
.allocationSize = 0,
@@ -719,9 +719,9 @@
.subresourceRange = {
.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT,
.baseMipLevel = 0,
- .numLevels = 1,
+ .levelCount = 1,
.baseArrayLayer = 0,
- .numLayers = 1
+ .layerCount = 1
},
.flags = 0,
.viewType = VK_IMAGE_VIEW_TYPE_2D,
@@ -751,7 +751,7 @@
assert(pass);
/* allocate memory */
- err = vkAllocMemory(demo->device, &mem_alloc, NULL, &demo->depth.mem);
+ err = vkAllocateMemory(demo->device, &mem_alloc, NULL, &demo->depth.mem);
assert(!err);
/* bind memory */
@@ -799,7 +799,7 @@
.usage = usage,
.flags = 0,
};
- VkMemoryAllocInfo mem_alloc = {
+ VkMemoryAllocateInfo mem_alloc = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
.pNext = NULL,
.allocationSize = 0,
@@ -819,7 +819,7 @@
assert(pass);
/* allocate memory */
- err = vkAllocMemory(demo->device, &mem_alloc, NULL, &tex_obj->mem);
+ err = vkAllocateMemory(demo->device, &mem_alloc, NULL, &tex_obj->mem);
assert(!err);
/* bind memory */
@@ -889,38 +889,38 @@
memset(&staging_texture, 0, sizeof(staging_texture));
demo_prepare_texture_image(demo, tex_colors[i], &staging_texture,
- VK_IMAGE_TILING_LINEAR, VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
+ VK_IMAGE_TILING_LINEAR, VK_IMAGE_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
demo_prepare_texture_image(demo, tex_colors[i], &demo->textures[i],
VK_IMAGE_TILING_OPTIMAL,
- (VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT | VK_IMAGE_USAGE_SAMPLED_BIT),
+ (VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT),
VK_MEMORY_PROPERTY_DEVICE_ONLY);
demo_set_image_layout(demo, staging_texture.image,
VK_IMAGE_ASPECT_COLOR_BIT,
staging_texture.imageLayout,
- VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL);
+ VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
demo_set_image_layout(demo, demo->textures[i].image,
VK_IMAGE_ASPECT_COLOR_BIT,
demo->textures[i].imageLayout,
- VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL);
+ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
VkImageCopy copy_region = {
.srcSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 },
.srcOffset = { 0, 0, 0 },
- .destSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 },
- .destOffset = { 0, 0, 0 },
+ .dstSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 },
+ .dstOffset = { 0, 0, 0 },
.extent = { staging_texture.tex_width, staging_texture.tex_height, 1 },
};
vkCmdCopyImage(demo->setup_cmd,
- staging_texture.image, VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL,
- demo->textures[i].image, VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL,
+ staging_texture.image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+ demo->textures[i].image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
1, ©_region);
demo_set_image_layout(demo, demo->textures[i].image,
VK_IMAGE_ASPECT_COLOR_BIT,
- VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL,
+ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
demo->textures[i].imageLayout);
demo_flush_init_cmd(demo);
@@ -990,7 +990,7 @@
.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT,
.flags = 0,
};
- VkMemoryAllocInfo mem_alloc = {
+ VkMemoryAllocateInfo mem_alloc = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
.pNext = NULL,
.allocationSize = 0,
@@ -1017,7 +1017,7 @@
&mem_alloc.memoryTypeIndex);
assert(pass);
- err = vkAllocMemory(demo->device, &mem_alloc, NULL, &demo->vertices.mem);
+ err = vkAllocateMemory(demo->device, &mem_alloc, NULL, &demo->vertices.mem);
assert(!err);
err = vkMapMemory(demo->device, demo->vertices.mem, 0, mem_alloc.allocationSize, 0, &data);
@@ -1304,12 +1304,12 @@
VkPipelineVertexInputStateCreateInfo vi;
VkPipelineInputAssemblyStateCreateInfo ia;
- VkPipelineRasterStateCreateInfo rs;
+ VkPipelineRasterizationStateCreateInfo rs;
VkPipelineColorBlendStateCreateInfo cb;
VkPipelineDepthStencilStateCreateInfo ds;
VkPipelineViewportStateCreateInfo vp;
VkPipelineMultisampleStateCreateInfo ms;
- VkDynamicState dynamicStateEnables[VK_DYNAMIC_STATE_NUM];
+ VkDynamicState dynamicStateEnables[VK_DYNAMIC_STATE_RANGE_SIZE];
VkPipelineDynamicStateCreateInfo dynamicState;
VkResult U_ASSERT_ONLY err;
@@ -1333,7 +1333,7 @@
rs.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO;
rs.fillMode = VK_FILL_MODE_SOLID;
rs.cullMode = VK_CULL_MODE_BACK_BIT;
- rs.frontFace = VK_FRONT_FACE_CW;
+ rs.frontFace = VK_FRONT_FACE_CLOCKWISE;
rs.depthClampEnable = VK_FALSE;
rs.rasterizerDiscardEnable = VK_FALSE;
rs.depthBiasEnable = VK_FALSE;
@@ -1358,7 +1358,7 @@
ds.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
ds.depthTestEnable = VK_TRUE;
ds.depthWriteEnable = VK_TRUE;
- ds.depthCompareOp = VK_COMPARE_OP_LESS_EQUAL;
+ ds.depthCompareOp = VK_COMPARE_OP_LESS_OR_EQUAL;
ds.depthBoundsTestEnable = VK_FALSE;
ds.back.stencilFailOp = VK_STENCIL_OP_KEEP;
ds.back.stencilPassOp = VK_STENCIL_OP_KEEP;
@@ -1369,7 +1369,7 @@
memset(&ms, 0, sizeof(ms));
ms.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
ms.pSampleMask = NULL;
- ms.rasterSamples = 1;
+ ms.rasterizationSamples = 1;
// Two stages: vs and fs
pipeline.stageCount = 2;
@@ -1384,7 +1384,7 @@
pipeline.pVertexInputState = &vi;
pipeline.pInputAssemblyState = &ia;
- pipeline.pRasterState = &rs;
+ pipeline.pRasterizationState = &rs;
pipeline.pColorBlendState = &cb;
pipeline.pMultisampleState = &ms;
pipeline.pViewportState = &vp;
@@ -1438,14 +1438,14 @@
VkResult U_ASSERT_ONLY err;
uint32_t i;
- VkDescriptorSetAllocInfo alloc_info = {
+ VkDescriptorSetAllocateInfo alloc_info = {
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO,
.pNext = NULL,
.descriptorPool = demo->desc_pool,
.setLayoutCount = 1,
.pSetLayouts = &demo->desc_layout
};
- err = vkAllocDescriptorSets(demo->device, &alloc_info, &demo->desc_set);
+ err = vkAllocateDescriptorSets(demo->device, &alloc_info, &demo->desc_set);
assert(!err);
memset(&tex_descs, 0, sizeof(tex_descs));
@@ -1457,7 +1457,7 @@
memset(&write, 0, sizeof(write));
write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
- write.destSet = demo->desc_set;
+ write.dstSet = demo->desc_set;
write.descriptorCount = DEMO_TEXTURE_COUNT;
write.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
write.pImageInfo = tex_descs;
@@ -1497,8 +1497,8 @@
{
VkResult U_ASSERT_ONLY err;
- const VkCmdPoolCreateInfo cmd_pool_info = {
- .sType = VK_STRUCTURE_TYPE_CMD_POOL_CREATE_INFO,
+ const VkCommandPoolCreateInfo cmd_pool_info = {
+ .sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO,
.pNext = NULL,
.queueFamilyIndex = demo->graphics_queue_node_index,
.flags = 0,
@@ -1506,14 +1506,14 @@
err = vkCreateCommandPool(demo->device, &cmd_pool_info, NULL, &demo->cmd_pool);
assert(!err);
- const VkCmdBufferAllocInfo cmd = {
- .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_ALLOC_INFO,
+ const VkCommandBufferAllocateInfo cmd = {
+ .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO,
.pNext = NULL,
- .cmdPool = demo->cmd_pool,
- .level = VK_CMD_BUFFER_LEVEL_PRIMARY,
+ .commandPool = demo->cmd_pool,
+ .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY,
.bufferCount = 1,
};
- err = vkAllocCommandBuffers(demo->device, &cmd, &demo->draw_cmd);
+ err = vkAllocateCommandBuffers(demo->device, &cmd, &demo->draw_cmd);
assert(!err);
demo_prepare_buffers(demo);
@@ -1759,15 +1759,15 @@
void* pUserData,
size_t size,
size_t alignment,
- VkSystemAllocScope allocScope)
+ VkSystemAllocationScope allocationScope)
{
return malloc(size);
}
void VKAPI myfree(
void* pUserData,
- void* pMem)
+ void* pMemory)
{
- free(pMem);
+ free(pMemory);
}
static void demo_init_vk(struct demo *demo)
{
@@ -1822,11 +1822,11 @@
err = vkEnumerateInstanceExtensionProperties(NULL, &instance_extension_count, instance_extensions);
assert(!err);
for (uint32_t i = 0; i < instance_extension_count; i++) {
- if (!strcmp("VK_EXT_KHR_swapchain", instance_extensions[i].extName)) {
+ if (!strcmp("VK_EXT_KHR_swapchain", instance_extensions[i].extensionName)) {
swapchainExtFound = 1;
extension_names[enabled_extension_count++] = "VK_EXT_KHR_swapchain";
}
- if (!strcmp(VK_DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extName)) {
+ if (!strcmp(VK_DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extensionName)) {
if (demo->validate) {
extension_names[enabled_extension_count++] = VK_DEBUG_REPORT_EXTENSION_NAME;
}
@@ -1844,8 +1844,8 @@
const VkApplicationInfo app = {
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
.pNext = NULL,
- .pAppName = APP_SHORT_NAME,
- .appVersion = 0,
+ .pApplicationName = APP_SHORT_NAME,
+ .applicationVersion = 0,
.pEngineName = APP_SHORT_NAME,
.engineVersion = 0,
.apiVersion = VK_API_VERSION,
@@ -1853,7 +1853,7 @@
VkInstanceCreateInfo inst_info = {
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
.pNext = NULL,
- .pAppInfo = &app,
+ .pApplicationInfo = &app,
.enabledLayerNameCount = enabled_layer_count,
.ppEnabledLayerNames = (const char *const*) layer_names,
.enabledExtensionNameCount = enabled_extension_count,
@@ -1869,7 +1869,7 @@
};
uint32_t gpu_count;
- demo->allocator.pfnAlloc = myalloc;
+ demo->allocator.pfnAllocation = myalloc;
demo->allocator.pfnFree = myfree;
err = vkCreateInstance(&inst_info, &demo->allocator, &demo->inst);
@@ -1941,7 +1941,7 @@
assert(!err);
for (uint32_t i = 0; i < device_extension_count; i++) {
- if (!strcmp("VK_EXT_KHR_device_swapchain", device_extensions[i].extName)) {
+ if (!strcmp("VK_EXT_KHR_device_swapchain", device_extensions[i].extensionName)) {
swapchainExtFound = 1;
extension_names[enabled_extension_count++] = "VK_EXT_KHR_device_swapchain";
}
diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index 0977d21..bec71c1 100644
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -87,7 +87,7 @@
VkDevice obj;
- VkFormatProperties format_props[VK_FORMAT_NUM];
+ VkFormatProperties format_props[VK_FORMAT_RANGE_SIZE];
};
struct layer_extension_list {
@@ -342,7 +342,7 @@
{
VkFormat f;
- for (f = 0; f < VK_FORMAT_NUM; f++) {
+ for (f = 0; f < VK_FORMAT_RANGE_SIZE; f++) {
const VkFormat fmt = f;
vkGetPhysicalDeviceFormatProperties(dev->gpu->obj, fmt, &dev->format_props[f]);
@@ -459,7 +459,7 @@
VkBool32 extension_found = 0;
for (uint32_t j = 0; j < gpu->device_extension_count; j++) {
VkExtensionProperties *ext_prop = &gpu->device_extensions[j];
- if (!strcmp(known_extensions[i], ext_prop->extName)) {
+ if (!strcmp(known_extensions[i], ext_prop->extensionName)) {
extension_found = 1;
enabled_extension_count++;
@@ -522,8 +522,8 @@
const VkApplicationInfo app_info = {
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
.pNext = NULL,
- .pAppName = APP_SHORT_NAME,
- .appVersion = 1,
+ .pApplicationName = APP_SHORT_NAME,
+ .applicationVersion = 1,
.pEngineName = APP_SHORT_NAME,
.engineVersion = 1,
.apiVersion = VK_API_VERSION,
@@ -531,7 +531,7 @@
VkInstanceCreateInfo inst_info = {
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
.pNext = NULL,
- .pAppInfo = &app_info,
+ .pApplicationInfo = &app_info,
.enabledLayerNameCount = 0,
.ppEnabledLayerNames = NULL,
.enabledExtensionNameCount = 0,
@@ -597,7 +597,7 @@
VkBool32 extension_found = 0;
for (uint32_t j = 0; j < inst->global_extension_count; j++) {
VkExtensionProperties *extension_prop = &inst->global_extensions[j];
- if (!strcmp(known_extensions[i], extension_prop->extName)) {
+ if (!strcmp(known_extensions[i], extension_prop->extensionName)) {
extension_found = 1;
global_extension_count++;
@@ -711,8 +711,8 @@
((features[i].flags & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT) ? "\n\t\tVK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT" : ""),
((features[i].flags & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT) ? "\n\t\tVK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT" : ""),
((features[i].flags & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) ? "\n\t\tVK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT" : ""),
- ((features[i].flags & VK_FORMAT_FEATURE_BLIT_SOURCE_BIT) ? "\n\t\tVK_FORMAT_FEATURE_BLIT_SOURCE_BIT" : ""),
- ((features[i].flags & VK_FORMAT_FEATURE_BLIT_DESTINATION_BIT) ? "\n\t\tVK_FORMAT_FEATURE_BLIT_DESTINATION_BIT" : ""),
+ ((features[i].flags & VK_FORMAT_FEATURE_BLIT_SRC_BIT) ? "\n\t\tVK_FORMAT_FEATURE_BLIT_SRC_BIT" : ""),
+ ((features[i].flags & VK_FORMAT_FEATURE_BLIT_DST_BIT) ? "\n\t\tVK_FORMAT_FEATURE_BLIT_DST_BIT" : ""),
((features[i].flags & VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT) ? "\n\t\tVK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT" : ""),
((features[i].flags & VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT) ? "\n\t\tVK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT" : ""),
((features[i].flags & VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT) ? "\n\t\tVK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT" : ""),
@@ -728,7 +728,7 @@
{
VkFormat fmt;
- for (fmt = 0; fmt < VK_FORMAT_NUM; fmt++) {
+ for (fmt = 0; fmt < VK_FORMAT_RANGE_SIZE; fmt++) {
app_dev_dump_format_props(dev, fmt);
}
}
@@ -753,7 +753,7 @@
printf("\tgeometryShader = %u\n", features->geometryShader );
printf("\ttessellationShader = %u\n", features->tessellationShader );
printf("\tsampleRateShading = %u\n", features->sampleRateShading );
- printf("\tdualSourceBlend = %u\n", features->dualSourceBlend );
+ printf("\tdualSrcBlend = %u\n", features->dualSrcBlend );
printf("\tlogicOp = %u\n", features->logicOp );
printf("\tmultiDrawIndirect = %u\n", features->multiDrawIndirect );
printf("\tdepthClip = %u\n", features->depthClamp );
@@ -846,7 +846,7 @@
printf("\t\tmaxVertexInputAttributeOffset = 0x%" PRIxLEAST32 "\n", limits->maxVertexInputAttributeOffset );
printf("\t\tmaxVertexInputBindingStride = 0x%" PRIxLEAST32 "\n", limits->maxVertexInputBindingStride );
printf("\t\tmaxVertexOutputComponents = 0x%" PRIxLEAST32 "\n", limits->maxVertexOutputComponents );
- printf("\t\tmaxTessellationGenLevel = 0x%" PRIxLEAST32 "\n", limits->maxTessellationGenLevel );
+ printf("\t\tmaxTessellationGenerationLevel = 0x%" PRIxLEAST32 "\n", limits->maxTessellationGenerationLevel );
printf("\t\tmaxTessellationPatchSize = 0x%" PRIxLEAST32 "\n", limits->maxTessellationPatchSize );
printf("\t\tmaxTessellationControlPerVertexInputComponents = 0x%" PRIxLEAST32 "\n", limits->maxTessellationControlPerVertexInputComponents );
printf("\t\tmaxTessellationControlPerVertexOutputComponents = 0x%" PRIxLEAST32 "\n", limits->maxTessellationControlPerVertexOutputComponents);
@@ -861,7 +861,7 @@
printf("\t\tmaxGeometryTotalOutputComponents = 0x%" PRIxLEAST32 "\n", limits->maxGeometryTotalOutputComponents );
printf("\t\tmaxFragmentInputComponents = 0x%" PRIxLEAST32 "\n", limits->maxFragmentInputComponents );
printf("\t\tmaxFragmentOutputAttachments = 0x%" PRIxLEAST32 "\n", limits->maxFragmentOutputAttachments );
- printf("\t\tmaxFragmentDualSourceAttachments = 0x%" PRIxLEAST32 "\n", limits->maxFragmentDualSourceAttachments );
+ printf("\t\tmaxFragmentDualSrcAttachments = 0x%" PRIxLEAST32 "\n", limits->maxFragmentDualSrcAttachments );
printf("\t\tmaxFragmentCombinedOutputResources = 0x%" PRIxLEAST32 "\n", limits->maxFragmentCombinedOutputResources );
printf("\t\tmaxComputeSharedMemorySize = 0x%" PRIxLEAST32 "\n", limits->maxComputeSharedMemorySize );
printf("\t\tmaxComputeWorkGroupCount[0] = 0x%" PRIxLEAST32 "\n", limits->maxComputeWorkGroupCount[0] );
@@ -962,7 +962,7 @@
printf("%s\t", indent);
printf("%-32s: extension revision %2d",
- ext_prop->extName, ext_prop->specVersion);
+ ext_prop->extensionName, ext_prop->specVersion);
}
printf("\n");
fflush(stdout);
@@ -1022,7 +1022,7 @@
extract_version(layer_info->layer_properties.specVersion, &major, &minor, &patch);
snprintf(spec_version, sizeof(spec_version), "%d.%d.%d", major, minor, patch);
- extract_version(layer_info->layer_properties.implVersion, &major, &minor, &patch);
+ extract_version(layer_info->layer_properties.implementationVersion, &major, &minor, &patch);
snprintf(layer_version, sizeof(layer_version), "%d.%d.%d", major, minor, patch);
printf("\t%s (%s) Vulkan version %s, layer version %s\n",
layer_info->layer_properties.layerName,
@@ -1078,7 +1078,7 @@
extract_version(layer_prop->specVersion, &major, &minor, &patch);
snprintf(spec_version, sizeof(spec_version), "%d.%d.%d", major, minor, patch);
- extract_version(layer_prop->implVersion, &major, &minor, &patch);
+ extract_version(layer_prop->implementationVersion, &major, &minor, &patch);
snprintf(layer_version, sizeof(layer_version), "%d.%d.%d", major, minor, patch);
printf("\t%s (%s) Vulkan version %s, layer version %s\n",
layer_prop->layerName, (char*) layer_prop->description, spec_version, layer_version);