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/tests/render_tests.cpp b/tests/render_tests.cpp
index b9de073..5d0b582 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -763,7 +763,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
- VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[2];
@@ -842,7 +842,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
sizeof(vb_data[0]), // stride; Distance between vertices in bytes (0 = no advancement)
- VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attrib;
@@ -860,7 +860,7 @@
VkPipelineColorBlendAttachmentState att = {};
att.blendEnable = VK_FALSE;
- att.channelWriteMask = 0xf;
+ att.colorWriteMask = 0xf;
pipelineobj.AddColorAttachment(1, &att);
ASSERT_VK_SUCCESS(BeginCommandBuffer());
@@ -951,7 +951,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
- VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[2];
@@ -1044,7 +1044,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
- VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[1];
@@ -1132,7 +1132,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
- VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[1];
@@ -1230,7 +1230,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
- VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[1];
@@ -1319,7 +1319,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
- VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[1];
@@ -1556,7 +1556,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
- VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[2];
@@ -1659,7 +1659,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
sizeof(vData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
- VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[2];
@@ -1752,7 +1752,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
- VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[2];
@@ -1855,10 +1855,10 @@
ds_state.depthCompareOp = VK_COMPARE_OP_LESS_OR_EQUAL;
ds_state.depthBoundsTestEnable = VK_FALSE;
ds_state.stencilTestEnable = VK_FALSE;
- ds_state.back.stencilDepthFailOp = VK_STENCIL_OP_KEEP;
- ds_state.back.stencilFailOp = VK_STENCIL_OP_KEEP;
- ds_state.back.stencilPassOp = VK_STENCIL_OP_KEEP;
- ds_state.back.stencilCompareOp = VK_COMPARE_OP_ALWAYS;
+ ds_state.back.depthFailOp = VK_STENCIL_OP_KEEP;
+ ds_state.back.failOp = VK_STENCIL_OP_KEEP;
+ ds_state.back.passOp = VK_STENCIL_OP_KEEP;
+ ds_state.back.compareOp = VK_COMPARE_OP_ALWAYS;
ds_state.front = ds_state.back;
pipelineobj.SetDepthStencil(&ds_state);
@@ -1869,7 +1869,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
- VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[2];
@@ -2744,7 +2744,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
sizeof(g_vb_texture_Data[0]), // stride; Distance between vertices in bytes (0 = no advancement)
- VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[2];
@@ -2766,10 +2766,10 @@
ds_state.depthCompareOp = VK_COMPARE_OP_LESS_OR_EQUAL;
ds_state.depthBoundsTestEnable = VK_FALSE;
ds_state.stencilTestEnable = VK_FALSE;
- ds_state.back.stencilDepthFailOp = VK_STENCIL_OP_KEEP;
- ds_state.back.stencilFailOp = VK_STENCIL_OP_KEEP;
- ds_state.back.stencilPassOp = VK_STENCIL_OP_KEEP;
- ds_state.back.stencilCompareOp = VK_COMPARE_OP_ALWAYS;
+ ds_state.back.depthFailOp = VK_STENCIL_OP_KEEP;
+ ds_state.back.failOp = VK_STENCIL_OP_KEEP;
+ ds_state.back.passOp = VK_STENCIL_OP_KEEP;
+ ds_state.back.compareOp = VK_COMPARE_OP_ALWAYS;
ds_state.front = ds_state.back;
pipelineobj.SetDepthStencil(&ds_state);