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/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 34f5f2d..75e474f 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -214,9 +214,9 @@
m_minDepthBounds = 0.f;
m_maxDepthBounds = 1.f;
- m_stencilCompareMask = 0xff;
- m_stencilWriteMask = 0xff;
- m_stencilReference = 0;
+ m_compareMask = 0xff;
+ m_writeMask = 0xff;
+ m_reference = 0;
VkCommandPoolCreateInfo cmd_pool_info;
cmd_pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO,
@@ -233,8 +233,8 @@
{
VkViewport viewport;
VkRect2D scissor;
- viewport.originX = 0;
- viewport.originY = 0;
+ viewport.x = 0;
+ viewport.y = 0;
viewport.width = 1.f * width;
viewport.height = 1.f * height;
viewport.minDepth = 0.f;
@@ -439,7 +439,7 @@
int VkDescriptorSetObj::AppendDummy()
{
/* request a descriptor but do not update it */
- VkDescriptorTypeCount tc = {};
+ VkDescriptorPoolSize tc = {};
tc.type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
tc.descriptorCount = 1;
m_type_counts.push_back(tc);
@@ -453,7 +453,7 @@
type == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC ||
type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER ||
type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC);
- VkDescriptorTypeCount tc = {};
+ VkDescriptorPoolSize tc = {};
tc.type = type;
tc.descriptorCount = 1;
m_type_counts.push_back(tc);
@@ -466,7 +466,7 @@
int VkDescriptorSetObj::AppendSamplerTexture( VkSamplerObj* sampler, VkTextureObj* texture)
{
- VkDescriptorTypeCount tc = {};
+ VkDescriptorPoolSize tc = {};
tc.type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
tc.descriptorCount = 1;
m_type_counts.push_back(tc);
@@ -496,9 +496,9 @@
// create VkDescriptorPool
VkDescriptorPoolCreateInfo pool = {};
pool.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
- pool.typeCount = m_type_counts.size();
+ pool.poolSizeCount = m_type_counts.size();
pool.maxSets = 1;
- pool.pTypeCounts = m_type_counts.data();
+ pool.pPoolSizes = m_type_counts.data();
init(*m_device, pool);
// create VkDescriptorSetLayout
@@ -815,10 +815,10 @@
view.image = VK_NULL_HANDLE;
view.viewType = VK_IMAGE_VIEW_TYPE_2D;
view.format = tex_format;
- view.channels.r = VK_CHANNEL_SWIZZLE_R;
- view.channels.g = VK_CHANNEL_SWIZZLE_G;
- view.channels.b = VK_CHANNEL_SWIZZLE_B;
- view.channels.a = VK_CHANNEL_SWIZZLE_A;
+ view.channels.r = VK_COMPONENT_SWIZZLE_R;
+ view.channels.g = VK_COMPONENT_SWIZZLE_G;
+ view.channels.b = VK_COMPONENT_SWIZZLE_B;
+ view.channels.a = VK_COMPONENT_SWIZZLE_A;
view.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
view.subresourceRange.baseMipLevel = 0;
view.subresourceRange.levelCount = 1;
@@ -1128,11 +1128,11 @@
m_ia_state.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
m_ia_state.primitiveRestartEnable = VK_FALSE;
- m_rs_state.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO;
+ m_rs_state.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
m_rs_state.pNext = VK_NULL_HANDLE;
m_rs_state.depthClampEnable = VK_TRUE;
m_rs_state.rasterizerDiscardEnable = VK_FALSE;
- m_rs_state.fillMode = VK_FILL_MODE_SOLID;
+ m_rs_state.polygonMode = VK_POLYGON_MODE_FILL;
m_rs_state.cullMode = VK_CULL_MODE_BACK_BIT;
m_rs_state.frontFace = VK_FRONT_FACE_CLOCKWISE;
m_rs_state.depthBiasEnable = VK_FALSE;
@@ -1172,14 +1172,14 @@
m_ds_state.depthWriteEnable = VK_FALSE;
m_ds_state.depthBoundsTestEnable = VK_FALSE;
m_ds_state.depthCompareOp = VK_COMPARE_OP_LESS_OR_EQUAL;
- m_ds_state.back.stencilDepthFailOp = VK_STENCIL_OP_KEEP;
- m_ds_state.back.stencilFailOp = VK_STENCIL_OP_KEEP;
- m_ds_state.back.stencilPassOp = VK_STENCIL_OP_KEEP;
- m_ds_state.back.stencilCompareOp = VK_COMPARE_OP_ALWAYS;
+ m_ds_state.back.depthFailOp = VK_STENCIL_OP_KEEP;
+ m_ds_state.back.failOp = VK_STENCIL_OP_KEEP;
+ m_ds_state.back.passOp = VK_STENCIL_OP_KEEP;
+ m_ds_state.back.compareOp = VK_COMPARE_OP_ALWAYS;
m_ds_state.stencilTestEnable = VK_FALSE;
- m_ds_state.back.stencilCompareMask = 0xff;
- m_ds_state.back.stencilWriteMask = 0xff;
- m_ds_state.back.stencilReference = 0;
+ m_ds_state.back.compareMask = 0xff;
+ m_ds_state.back.writeMask = 0xff;
+ m_ds_state.back.reference = 0;
m_ds_state.minDepthBounds = 0.f;
m_ds_state.maxDepthBounds = 1.f;
@@ -1505,7 +1505,7 @@
void VkCommandBufferObj::BeginRenderPass(const VkRenderPassBeginInfo &info)
{
- vkCmdBeginRenderPass( handle(), &info, VK_RENDER_PASS_CONTENTS_INLINE);
+ vkCmdBeginRenderPass( handle(), &info, VK_SUBPASS_CONTENTS_INLINE);
}
void VkCommandBufferObj::EndRenderPass()
@@ -1555,23 +1555,23 @@
void VkCommandBufferObj::SetStencilReadMask(
VkStencilFaceFlags faceMask,
- uint32_t stencilCompareMask)
+ uint32_t compareMask)
{
- vkCmdSetStencilCompareMask( handle(), faceMask, stencilCompareMask);
+ vkCmdSetStencilCompareMask( handle(), faceMask, compareMask);
}
void VkCommandBufferObj::SetStencilWriteMask(
VkStencilFaceFlags faceMask,
- uint32_t stencilWriteMask)
+ uint32_t writeMask)
{
- vkCmdSetStencilWriteMask( handle(), faceMask, stencilWriteMask);
+ vkCmdSetStencilWriteMask( handle(), faceMask, writeMask);
}
void VkCommandBufferObj::SetStencilReference(
VkStencilFaceFlags faceMask,
- uint32_t stencilReference)
+ uint32_t reference)
{
- vkCmdSetStencilReference( handle(), faceMask, stencilReference);
+ vkCmdSetStencilReference( handle(), faceMask, reference);
}
void VkCommandBufferObj::AddRenderTarget(VkImageObj *renderTarget)