bug 14918 part 3: sed renames
s/VK_MAX_PHYSICAL_DEVICE_NAME\b/VK_MAX_PHYSICAL_DEVICE_NAME_SIZE/g
s/VK_UUID_LENGTH/VK_UUID_SIZE/g
s/VK_MAX_EXTENSION_NAME\b/VK_MAX_EXTENSION_NAME_SIZE/g
s/VK_MAX_DESCRIPTION\b/VK_MAX_DESCRIPTION_SIZE/g
s/VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO/VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO/g
s/VK_CHANNEL_SWIZZLE/VK_COMPONENT_SWIZZLE/g
s/VkChannelSwizzle/VkComponentSwizzle/g
s/VK_VERTEX_INPUT_STEP_RATE/VK_VERTEX_INPUT_RATE/g
s/VkVertexInputStepRate/VkVertexInputRate/g
s/VK_FILL_MODE_SOLID/VK_POLYGON_MODE_FILL/g
s/VK_FILL_MODE_WIREFRAME/VK_POLYGON_MODE_LINE/g
s/VK_FILL_MODE_POINTS/VK_POLYGON_MODE_POINT/g
s/VkFillMode/VkPolygonMode/g
s/fillMode/polygonMode/g
s/VkBlend\b/VkBlendFactor/g
s/VK_BLEND_ZERO/VK_BLEND_FACTOR_ZERO/g
s/VK_BLEND_ONE/VK_BLEND_FACTOR_ONE/g
s/VK_BLEND_SRC/VK_BLEND_FACTOR_SRC/g
s/VK_BLEND_DST/VK_BLEND_FACTOR_DST/g
s/VK_BLEND_CONSTANT/VK_BLEND_FACTOR_CONSTANT/g
s/VK_RENDER_PASS_CONTENTS/VK_SUBPASS_CONTENTS/g
s/VkRenderPassContents/VkSubpassContents/g
s/VK_QUEUE_DMA_BIT/VK_QUEUE_TRANSFER_BIT/g
s/VK_CHANNEL_/VK_COLOR_COMPONENT_/g
s/VkChannelFlagBits/VkColorComponentFlagBits/g
s/VK_QUERY_CONTROL_CONSERVATIVE_BIT/VK_QUERY_CONTROL_PRECISE_BIT/g
s/occlusionQueryNonConservative/occlusionQueryPrecise/g
s/recommendedBufferCopyOffsetAlignment/optimalBufferCopyOffsetAlignment/g
s/recommendedBufferCopyRowPitchAlignment/optimalBufferCopyRowPitchAlignment/g
s/stencilCompareMask/compareMask/g
s/stencilWriteMask/writeMask/g
s/stencilReference/reference/g
s/VkImageSubresourceCopy/VkImageSubresourceLayers/g
s/typeCount/poolSizeCount/g
s/pTypeCounts/pPoolSizes/g
s/VkDescriptorTypeCount/VkDescriptorPoolSize/g
s/srcBlendColor/srcColorBlendFactor/g
s/dstBlendColor/dstColorBlendFactor/g
s/blendOpColor/colorBlendOp/g
s/srcBlendAlpha/srcAlphaBlendFactor/g
s/dstBlendAlpha/dstAlphaBlendFactor/g
s/blendOpAlpha/alphaBlendOp/g
s/channelWriteMask/colorWriteMask/g
s/stencilFailOp/failOp/g
s/stencilPassOp/passOp/g
s/stencilDepthFailOp/depthFailOp/g
s/stencilCompareOp/compareOp/g
s/stencilCompareMask/compareMask/g
s/stencilWriteMask/writeMask/g
s/stencilReference/reference/g
s/originX/x/g
s/originY/y/g
s/stepRate/inputRate/g
s/VkChannelMapping/VkComponentMapping/g
diff --git a/demos/cube.c b/demos/cube.c
index ed5fd3a..a73f2d1 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -553,7 +553,7 @@
err = vkBeginCommandBuffer(cmd_buf, &cmd_buf_info);
assert(!err);
- vkCmdBeginRenderPass(cmd_buf, &rp_begin, VK_RENDER_PASS_CONTENTS_INLINE);
+ vkCmdBeginRenderPass(cmd_buf, &rp_begin, VK_SUBPASS_CONTENTS_INLINE);
vkCmdBindPipeline(cmd_buf, VK_PIPELINE_BIND_POINT_GRAPHICS,
demo->pipeline);
@@ -846,10 +846,10 @@
.pNext = NULL,
.format = demo->format,
.channels = {
- .r = VK_CHANNEL_SWIZZLE_R,
- .g = VK_CHANNEL_SWIZZLE_G,
- .b = VK_CHANNEL_SWIZZLE_B,
- .a = VK_CHANNEL_SWIZZLE_A,
+ .r = VK_COMPONENT_SWIZZLE_R,
+ .g = VK_COMPONENT_SWIZZLE_G,
+ .b = VK_COMPONENT_SWIZZLE_B,
+ .a = VK_COMPONENT_SWIZZLE_A,
},
.subresourceRange = {
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
@@ -1196,10 +1196,10 @@
.image = VK_NULL_HANDLE,
.viewType = VK_IMAGE_VIEW_TYPE_2D,
.format = tex_format,
- .channels = { VK_CHANNEL_SWIZZLE_R,
- VK_CHANNEL_SWIZZLE_G,
- VK_CHANNEL_SWIZZLE_B,
- VK_CHANNEL_SWIZZLE_A, },
+ .channels = { VK_COMPONENT_SWIZZLE_R,
+ VK_COMPONENT_SWIZZLE_G,
+ VK_COMPONENT_SWIZZLE_B,
+ VK_COMPONENT_SWIZZLE_A, },
.subresourceRange = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 },
.flags = 0,
};
@@ -1580,8 +1580,8 @@
ia.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
memset(&rs, 0, sizeof(rs));
- rs.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO;
- rs.fillMode = VK_FILL_MODE_SOLID;
+ rs.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
+ rs.polygonMode = VK_POLYGON_MODE_FILL;
rs.cullMode = VK_CULL_MODE_BACK_BIT;
rs.frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE;
rs.depthClampEnable = VK_FALSE;
@@ -1592,7 +1592,7 @@
cb.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
VkPipelineColorBlendAttachmentState att_state[1];
memset(att_state, 0, sizeof(att_state));
- att_state[0].channelWriteMask = 0xf;
+ att_state[0].colorWriteMask = 0xf;
att_state[0].blendEnable = VK_FALSE;
cb.attachmentCount = 1;
cb.pAttachments = att_state;
@@ -1610,9 +1610,9 @@
ds.depthWriteEnable = VK_TRUE;
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;
- ds.back.stencilCompareOp = VK_COMPARE_OP_ALWAYS;
+ ds.back.failOp = VK_STENCIL_OP_KEEP;
+ ds.back.passOp = VK_STENCIL_OP_KEEP;
+ ds.back.compareOp = VK_COMPARE_OP_ALWAYS;
ds.stencilTestEnable = VK_FALSE;
ds.front = ds.back;
@@ -1664,7 +1664,7 @@
static void demo_prepare_descriptor_pool(struct demo *demo)
{
- const VkDescriptorTypeCount type_counts[2] = {
+ const VkDescriptorPoolSize type_counts[2] = {
[0] = {
.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
.descriptorCount = 1,
@@ -1678,8 +1678,8 @@
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
.pNext = NULL,
.maxSets = 1,
- .typeCount = 2,
- .pTypeCounts = type_counts,
+ .poolSizeCount = 2,
+ .pPoolSizes = type_counts,
};
VkResult U_ASSERT_ONLY err;
diff --git a/demos/tri.c b/demos/tri.c
index 2dbfeaf..e1035fb 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -395,7 +395,7 @@
err = vkBeginCommandBuffer(demo->draw_cmd, &cmd_buf_info);
assert(!err);
- vkCmdBeginRenderPass(demo->draw_cmd, &rp_begin, VK_RENDER_PASS_CONTENTS_INLINE);
+ vkCmdBeginRenderPass(demo->draw_cmd, &rp_begin, VK_SUBPASS_CONTENTS_INLINE);
vkCmdBindPipeline(demo->draw_cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
demo->pipeline);
vkCmdBindDescriptorSets(demo->draw_cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, demo->pipeline_layout,
@@ -654,10 +654,10 @@
.pNext = NULL,
.format = demo->format,
.channels = {
- .r = VK_CHANNEL_SWIZZLE_R,
- .g = VK_CHANNEL_SWIZZLE_G,
- .b = VK_CHANNEL_SWIZZLE_B,
- .a = VK_CHANNEL_SWIZZLE_A,
+ .r = VK_COMPONENT_SWIZZLE_R,
+ .g = VK_COMPONENT_SWIZZLE_G,
+ .b = VK_COMPONENT_SWIZZLE_B,
+ .a = VK_COMPONENT_SWIZZLE_A,
},
.subresourceRange = {
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
@@ -954,10 +954,10 @@
.image = VK_NULL_HANDLE,
.viewType = VK_IMAGE_VIEW_TYPE_2D,
.format = tex_format,
- .channels = { VK_CHANNEL_SWIZZLE_R,
- VK_CHANNEL_SWIZZLE_G,
- VK_CHANNEL_SWIZZLE_B,
- VK_CHANNEL_SWIZZLE_A, },
+ .channels = { VK_COMPONENT_SWIZZLE_R,
+ VK_COMPONENT_SWIZZLE_G,
+ VK_COMPONENT_SWIZZLE_B,
+ VK_COMPONENT_SWIZZLE_A, },
.subresourceRange = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 },
.flags = 0,
};
@@ -1040,7 +1040,7 @@
demo->vertices.vi_bindings[0].binding = VERTEX_BUFFER_BIND_ID;
demo->vertices.vi_bindings[0].stride = sizeof(vb[0]);
- demo->vertices.vi_bindings[0].stepRate = VK_VERTEX_INPUT_STEP_RATE_VERTEX;
+ demo->vertices.vi_bindings[0].inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
demo->vertices.vi_attrs[0].binding = VERTEX_BUFFER_BIND_ID;
demo->vertices.vi_attrs[0].location = 0;
@@ -1330,8 +1330,8 @@
ia.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
memset(&rs, 0, sizeof(rs));
- rs.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO;
- rs.fillMode = VK_FILL_MODE_SOLID;
+ rs.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
+ rs.polygonMode = VK_POLYGON_MODE_FILL;
rs.cullMode = VK_CULL_MODE_BACK_BIT;
rs.frontFace = VK_FRONT_FACE_CLOCKWISE;
rs.depthClampEnable = VK_FALSE;
@@ -1342,7 +1342,7 @@
cb.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
VkPipelineColorBlendAttachmentState att_state[1];
memset(att_state, 0, sizeof(att_state));
- att_state[0].channelWriteMask = 0xf;
+ att_state[0].colorWriteMask = 0xf;
att_state[0].blendEnable = VK_FALSE;
cb.attachmentCount = 1;
cb.pAttachments = att_state;
@@ -1360,9 +1360,9 @@
ds.depthWriteEnable = VK_TRUE;
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;
- ds.back.stencilCompareOp = VK_COMPARE_OP_ALWAYS;
+ ds.back.failOp = VK_STENCIL_OP_KEEP;
+ ds.back.passOp = VK_STENCIL_OP_KEEP;
+ ds.back.compareOp = VK_COMPARE_OP_ALWAYS;
ds.stencilTestEnable = VK_FALSE;
ds.front = ds.back;
@@ -1413,7 +1413,7 @@
static void demo_prepare_descriptor_pool(struct demo *demo)
{
- const VkDescriptorTypeCount type_count = {
+ const VkDescriptorPoolSize type_count = {
.type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
.descriptorCount = DEMO_TEXTURE_COUNT,
};
@@ -1421,8 +1421,8 @@
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
.pNext = NULL,
.maxSets = 1,
- .typeCount = 1,
- .pTypeCounts = &type_count,
+ .poolSizeCount = 1,
+ .pPoolSizes = &type_count,
};
VkResult U_ASSERT_ONLY err;
diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index 49b2276..01ff3dd 100644
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -758,14 +758,14 @@
printf("\tmultiDrawIndirect = %u\n", features->multiDrawIndirect );
printf("\tdepthClamp = %u\n", features->depthClamp );
printf("\tdepthBiasClamp = %u\n", features->depthBiasClamp );
- printf("\tfillModeNonSolid = %u\n", features->fillModeNonSolid );
+ printf("\tpolygonModeNonSolid = %u\n", features->polygonModeNonSolid );
printf("\tdepthBounds = %u\n", features->depthBounds );
printf("\twideLines = %u\n", features->wideLines );
printf("\tlargePoints = %u\n", features->largePoints );
printf("\ttextureCompressionETC2 = %u\n", features->textureCompressionETC2 );
printf("\ttextureCompressionASTC_LDR = %u\n", features->textureCompressionASTC_LDR );
printf("\ttextureCompressionBC = %u\n", features->textureCompressionBC );
- printf("\tocclusionQueryNonConservative = %u\n", features->occlusionQueryNonConservative );
+ printf("\tocclusionQueryPrecise = %u\n", features->occlusionQueryPrecise );
printf("\tpipelineStatisticsQuery = %u\n", features->pipelineStatisticsQuery );
printf("\tvertexSideEffects = %u\n", features->vertexPipelineStoresAndAtomics );
printf("\ttessellationSideEffects = %u\n", features->fragmentStoresAndAtomics );
@@ -920,8 +920,8 @@
printf("\t\tpointSizeGranularity = %f\n", limits->pointSizeGranularity );
printf("\t\tlineWidthGranularity = %f\n", limits->lineWidthGranularity );
printf("\t\tstrictLines = %u\n", limits->strictLines );
- printf("\t\trecommendedBufferCopyOffsetAlignment = 0x%" PRIxLEAST64 "\n", limits->recommendedBufferCopyOffsetAlignment );
- printf("\t\trecommendedBufferCopyRowPitchAlignment = 0x%" PRIxLEAST64 "\n", limits->recommendedBufferCopyRowPitchAlignment );
+ printf("\t\toptimalBufferCopyOffsetAlignment = 0x%" PRIxLEAST64 "\n", limits->optimalBufferCopyOffsetAlignment );
+ printf("\t\toptimalBufferCopyRowPitchAlignment = 0x%" PRIxLEAST64 "\n", limits->optimalBufferCopyRowPitchAlignment );
}
static void app_gpu_dump_props(const struct app_gpu *gpu)
@@ -979,7 +979,7 @@
printf("\tqueueFlags = %c%c%c\n",
(props->queueFlags & VK_QUEUE_GRAPHICS_BIT) ? 'G' : '.',
(props->queueFlags & VK_QUEUE_COMPUTE_BIT) ? 'C' : '.',
- (props->queueFlags & VK_QUEUE_DMA_BIT) ? 'D' : '.');
+ (props->queueFlags & VK_QUEUE_TRANSFER_BIT) ? 'D' : '.');
printf("\tqueueCount = %u\n", props->queueCount);
printf("\ttimestampValidBits = %u\n", props->timestampValidBits);
printf("\tminImageTransferGranularity = (%d, %d, %d)\n",