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/tests/render_tests.cpp b/tests/render_tests.cpp
index 9576e69..b9de073 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -266,32 +266,32 @@
public:
void RotateTriangleVSUniform(glm::mat4 Projection, glm::mat4 View, glm::mat4 Model,
- VkConstantBufferObj *constantBuffer, VkCommandBufferObj *cmdBuffer);
- void GenericDrawPreparation(VkCommandBufferObj *cmdBuffer, VkPipelineObj &pipelineobj, VkDescriptorSetObj &descriptorSet);
+ VkConstantBufferObj *constantBuffer, VkCommandBufferObj *commandBuffer);
+ void GenericDrawPreparation(VkCommandBufferObj *commandBuffer, VkPipelineObj &pipelineobj, VkDescriptorSetObj &descriptorSet);
void GenericDrawPreparation(VkPipelineObj &pipelineobj, VkDescriptorSetObj &descriptorSet)
- { GenericDrawPreparation(m_cmdBuffer, pipelineobj, descriptorSet); }
+ { GenericDrawPreparation(m_commandBuffer, pipelineobj, descriptorSet); }
void InitDepthStencil();
void VKTriangleTest(const char *vertShaderText, const char *fragShaderText, const bool rotate);
- VkResult BeginCommandBuffer(VkCommandBufferObj &cmdBuffer);
- VkResult BeginCommandBuffer(VkCommandBufferObj &cmdBuffer, VkCmdBufferBeginInfo *beginInfo);
- VkResult EndCommandBuffer(VkCommandBufferObj &cmdBuffer);
+ VkResult BeginCommandBuffer(VkCommandBufferObj &commandBuffer);
+ VkResult BeginCommandBuffer(VkCommandBufferObj &commandBuffer, VkCommandBufferBeginInfo *beginInfo);
+ VkResult EndCommandBuffer(VkCommandBufferObj &commandBuffer);
/* Convenience functions that use built-in command buffer */
- VkResult BeginCommandBuffer() { return BeginCommandBuffer(*m_cmdBuffer); }
- VkResult BeginCommandBuffer(VkCmdBufferBeginInfo *beginInfo) { return BeginCommandBuffer(*m_cmdBuffer, beginInfo); }
- VkResult EndCommandBuffer() { return EndCommandBuffer(*m_cmdBuffer); }
+ VkResult BeginCommandBuffer() { return BeginCommandBuffer(*m_commandBuffer); }
+ VkResult BeginCommandBuffer(VkCommandBufferBeginInfo *beginInfo) { return BeginCommandBuffer(*m_commandBuffer, beginInfo); }
+ VkResult EndCommandBuffer() { return EndCommandBuffer(*m_commandBuffer); }
void Draw(uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance)
- { m_cmdBuffer->Draw(vertexCount, instanceCount, firstVertex, firstInstance); }
+ { m_commandBuffer->Draw(vertexCount, instanceCount, firstVertex, firstInstance); }
void DrawIndexed(uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance)
- { m_cmdBuffer->DrawIndexed(indexCount, instanceCount, firstIndex, vertexOffset, firstInstance); }
- void QueueCommandBuffer() { m_cmdBuffer->QueueCommandBuffer(); }
+ { m_commandBuffer->DrawIndexed(indexCount, instanceCount, firstIndex, vertexOffset, firstInstance); }
+ void QueueCommandBuffer() { m_commandBuffer->QueueCommandBuffer(); }
void RotateTriangleVSUniform(glm::mat4 Projection, glm::mat4 View, glm::mat4 Model,
VkConstantBufferObj *constantBuffer)
- {RotateTriangleVSUniform(Projection, View, Model, constantBuffer, m_cmdBuffer); }
+ {RotateTriangleVSUniform(Projection, View, Model, constantBuffer, m_commandBuffer); }
void BindVertexBuffer(VkConstantBufferObj *vertexBuffer, VkDeviceSize offset, uint32_t binding)
- { m_cmdBuffer->BindVertexBuffer(vertexBuffer, offset, binding); }
+ { m_commandBuffer->BindVertexBuffer(vertexBuffer, offset, binding); }
void BindIndexBuffer(VkIndexBufferObj *indexBuffer, VkDeviceSize offset)
- { m_cmdBuffer->BindIndexBuffer(indexBuffer, offset); }
+ { m_commandBuffer->BindIndexBuffer(indexBuffer, offset); }
@@ -307,8 +307,8 @@
this->app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
this->app_info.pNext = NULL;
- this->app_info.pAppName = "render_tests";
- this->app_info.appVersion = 1;
+ this->app_info.pApplicationName = "render_tests";
+ this->app_info.applicationVersion = 1;
this->app_info.pEngineName = "unittest";
this->app_info.engineVersion = 1;
this->app_info.apiVersion = VK_API_VERSION;
@@ -322,77 +322,77 @@
}
};
-VkResult VkRenderTest::BeginCommandBuffer(VkCommandBufferObj &cmdBuffer)
+VkResult VkRenderTest::BeginCommandBuffer(VkCommandBufferObj &commandBuffer)
{
VkResult result;
- result = cmdBuffer.BeginCommandBuffer();
+ result = commandBuffer.BeginCommandBuffer();
/*
* For render test all drawing happens in a single render pass
* on a single command buffer.
*/
if (VK_SUCCESS == result && renderPass()) {
- cmdBuffer.BeginRenderPass(renderPassBeginInfo());
+ commandBuffer.BeginRenderPass(renderPassBeginInfo());
}
return result;
}
-VkResult VkRenderTest::BeginCommandBuffer(VkCommandBufferObj &cmdBuffer, VkCmdBufferBeginInfo *beginInfo)
+VkResult VkRenderTest::BeginCommandBuffer(VkCommandBufferObj &commandBuffer, VkCommandBufferBeginInfo *beginInfo)
{
VkResult result;
- result = cmdBuffer.BeginCommandBuffer(beginInfo);
+ result = commandBuffer.BeginCommandBuffer(beginInfo);
/*
* For render test all drawing happens in a single render pass
* on a single command buffer.
*/
if (VK_SUCCESS == result && renderPass()) {
- cmdBuffer.BeginRenderPass(renderPassBeginInfo());
+ commandBuffer.BeginRenderPass(renderPassBeginInfo());
}
return result;
}
-VkResult VkRenderTest::EndCommandBuffer(VkCommandBufferObj &cmdBuffer)
+VkResult VkRenderTest::EndCommandBuffer(VkCommandBufferObj &commandBuffer)
{
VkResult result;
if (renderPass()) {
- cmdBuffer.EndRenderPass();
+ commandBuffer.EndRenderPass();
}
- result = cmdBuffer.EndCommandBuffer();
+ result = commandBuffer.EndCommandBuffer();
return result;
}
-void VkRenderTest::GenericDrawPreparation(VkCommandBufferObj *cmdBuffer, VkPipelineObj &pipelineobj, VkDescriptorSetObj &descriptorSet)
+void VkRenderTest::GenericDrawPreparation(VkCommandBufferObj *commandBuffer, VkPipelineObj &pipelineobj, VkDescriptorSetObj &descriptorSet)
{
if (!m_clear_via_load_op) {
if (m_depthStencil->Initialized()) {
- cmdBuffer->ClearAllBuffers(m_clear_color, m_depth_clear_color, m_stencil_clear_color, m_depthStencil);
+ commandBuffer->ClearAllBuffers(m_clear_color, m_depth_clear_color, m_stencil_clear_color, m_depthStencil);
} else {
- cmdBuffer->ClearAllBuffers(m_clear_color, m_depth_clear_color, m_stencil_clear_color, NULL);
+ commandBuffer->ClearAllBuffers(m_clear_color, m_depth_clear_color, m_stencil_clear_color, NULL);
}
}
- cmdBuffer->PrepareAttachments();
- cmdBuffer->SetViewport(m_viewports.size(), m_viewports.data());
- cmdBuffer->SetScissor(m_scissors.size(), m_scissors.data());
+ commandBuffer->PrepareAttachments();
+ commandBuffer->SetViewport(m_viewports.size(), m_viewports.data());
+ commandBuffer->SetScissor(m_scissors.size(), m_scissors.data());
- descriptorSet.CreateVKDescriptorSet(cmdBuffer);
+ descriptorSet.CreateVKDescriptorSet(commandBuffer);
VkResult err = pipelineobj.CreateVKPipeline(descriptorSet.GetPipelineLayout(), renderPass());
ASSERT_VK_SUCCESS(err);
- cmdBuffer->BindPipeline(pipelineobj);
- cmdBuffer->BindDescriptorSet(descriptorSet);
+ commandBuffer->BindPipeline(pipelineobj);
+ commandBuffer->BindDescriptorSet(descriptorSet);
}
void VkRenderTest::RotateTriangleVSUniform(glm::mat4 Projection, glm::mat4 View, glm::mat4 Model,
- VkConstantBufferObj *constantBuffer, VkCommandBufferObj *cmdBuffer)
+ VkConstantBufferObj *constantBuffer, VkCommandBufferObj *commandBuffer)
{
int i;
glm::mat4 MVP;
@@ -410,7 +410,7 @@
constantBuffer->memory().unmap();
// submit the command buffer to the universal queue
- cmdBuffer->QueueCommandBuffer();
+ commandBuffer->QueueCommandBuffer();
err = vkQueueWaitIdle( m_device->m_queue );
ASSERT_VK_SUCCESS( err );
@@ -503,9 +503,9 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
- VkCmdBufferBeginInfo cbBeginInfo;
- memset(&cbBeginInfo, 0, sizeof(VkCmdBufferBeginInfo));
- cbBeginInfo.sType = VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO;
+ VkCommandBufferBeginInfo cbBeginInfo;
+ memset(&cbBeginInfo, 0, sizeof(VkCommandBufferBeginInfo));
+ cbBeginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
cbBeginInfo.flags = 0;
ASSERT_VK_SUCCESS(BeginCommandBuffer(&cbBeginInfo));
@@ -1406,9 +1406,9 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
- VkCmdBufferBeginInfo cbBeginInfo;
- memset(&cbBeginInfo, 0, sizeof(VkCmdBufferBeginInfo));
- cbBeginInfo.sType = VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO;
+ VkCommandBufferBeginInfo cbBeginInfo;
+ memset(&cbBeginInfo, 0, sizeof(VkCommandBufferBeginInfo));
+ cbBeginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
cbBeginInfo.flags = 0;
ASSERT_VK_SUCCESS(BeginCommandBuffer(&cbBeginInfo));
@@ -1852,7 +1852,7 @@
VkPipelineDepthStencilStateCreateInfo ds_state;
ds_state.depthTestEnable = VK_TRUE;
ds_state.depthWriteEnable = VK_TRUE;
- ds_state.depthCompareOp = VK_COMPARE_OP_LESS_EQUAL;
+ 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;
@@ -2763,7 +2763,7 @@
VkPipelineDepthStencilStateCreateInfo ds_state;
ds_state.depthTestEnable = VK_TRUE;
ds_state.depthWriteEnable = VK_TRUE;
- ds_state.depthCompareOp = VK_COMPARE_OP_LESS_EQUAL;
+ 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;
@@ -2775,9 +2775,9 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget(m_depthStencil->BindInfo()));
- VkCmdBufferBeginInfo cbBeginInfo;
- memset(&cbBeginInfo, 0, sizeof(VkCmdBufferBeginInfo));
- cbBeginInfo.sType = VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO;
+ VkCommandBufferBeginInfo cbBeginInfo;
+ memset(&cbBeginInfo, 0, sizeof(VkCommandBufferBeginInfo));
+ cbBeginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
cbBeginInfo.flags = 0;
ASSERT_VK_SUCCESS(BeginCommandBuffer(&cbBeginInfo));
@@ -4137,7 +4137,7 @@
color_attachment.clearValue.color.float32[3] = 0;
color_attachment.colorAttachment = 0;
VkClearRect clear_rect = { { { 0, 0 }, { (int)m_width, (int)m_height } } };
- vkCmdClearAttachments(m_cmdBuffer->handle(), 1, &color_attachment,
+ vkCmdClearAttachments(m_commandBuffer->handle(), 1, &color_attachment,
1, &clear_rect);
EndCommandBuffer();