Bug 14224: Remove abbreviations on some API symbols
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 14d4a51..425042c 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -316,8 +316,8 @@
.stencilDepthFailOp = VK_STENCIL_OP_KEEP,
.stencilCompareOp = VK_COMPARE_OP_NEVER
};
- VkPipelineDsStateCreateInfo ds_ci = {
- .sType = VK_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO,
+ VkPipelineDepthStencilStateCreateInfo ds_ci = {
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,
.pNext = NULL,
.depthTestEnable = VK_FALSE,
.depthWriteEnable = VK_TRUE,
@@ -1087,20 +1087,20 @@
.pSpecializationInfo = NULL,
};
const VkGraphicsPipelineCreateInfo gp_ci = {
- .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
- .pNext = NULL,
- .stageCount = 1,
- .pStages = &pipe_vs_ci,
- .pVertexInputState = NULL,
- .pIaState = NULL,
- .pTessState = NULL,
- .pVpState = NULL,
- .pRsState = NULL,
- .pMsState = NULL,
- .pDsState = NULL,
- .pCbState = NULL,
- .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
- .layout = pipeline_layout,
+ .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+ .pNext = NULL,
+ .stageCount = 1,
+ .pStages = &pipe_vs_ci,
+ .pVertexInputState = NULL,
+ .pInputAssemblyState = NULL,
+ .pTessellationState = NULL,
+ .pViewportState = NULL,
+ .pRasterState = NULL,
+ .pMultisampleState = NULL,
+ .pDepthStencilState = NULL,
+ .pColorBlendState = NULL,
+ .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+ .layout = pipeline_layout,
};
const VkPipelineCacheCreateInfo pc_ci = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
@@ -1207,20 +1207,20 @@
ASSERT_VK_SUCCESS(err);
const VkGraphicsPipelineCreateInfo gp_ci = {
- .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
- .pNext = NULL,
- .stageCount = 0,
- .pStages = NULL, // Creating Gfx Pipeline w/o VS is a violation
- .pVertexInputState = NULL,
- .pIaState = NULL,
- .pTessState = NULL,
- .pVpState = NULL,
- .pRsState = NULL,
- .pMsState = NULL,
- .pDsState = NULL,
- .pCbState = NULL,
- .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
- .layout = pipeline_layout,
+ .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+ .pNext = NULL,
+ .stageCount = 0,
+ .pStages = NULL, // Creating Gfx Pipeline w/o VS is a violation
+ .pVertexInputState = NULL,
+ .pInputAssemblyState = NULL,
+ .pTessellationState = NULL,
+ .pViewportState = NULL,
+ .pRasterState = NULL,
+ .pMultisampleState = NULL,
+ .pDepthStencilState = NULL,
+ .pColorBlendState = NULL,
+ .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+ .layout = pipeline_layout,
};
const VkPipelineCacheCreateInfo pc_ci = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
@@ -1373,20 +1373,20 @@
.pSpecializationInfo = NULL,
};
const VkGraphicsPipelineCreateInfo gp_ci = {
- .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
- .pNext = NULL,
- .stageCount = 1,
- .pStages = &pipe_vs_ci,
- .pVertexInputState = NULL,
- .pIaState = NULL,
- .pTessState = NULL,
- .pVpState = NULL,
- .pRsState = NULL,
- .pMsState = NULL,
- .pDsState = NULL,
- .pCbState = NULL,
- .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
- .layout = pipeline_layout,
+ .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+ .pNext = NULL,
+ .stageCount = 0,
+ .pStages = &pipe_vs_ci,
+ .pVertexInputState = NULL,
+ .pInputAssemblyState = NULL,
+ .pTessellationState = NULL,
+ .pViewportState = NULL,
+ .pRasterState = NULL,
+ .pMultisampleState = NULL,
+ .pDepthStencilState = NULL,
+ .pColorBlendState = NULL,
+ .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+ .layout = pipeline_layout,
};
const VkPipelineCacheCreateInfo pc_ci = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
@@ -1815,8 +1815,8 @@
err = vkAllocDescriptorSets(m_device->device(), ds_pool, VK_DESCRIPTOR_SET_USAGE_ONE_SHOT, 1, &ds_layout, &descriptorSet, &ds_count);
ASSERT_VK_SUCCESS(err);
- const VkPipelineMsStateCreateInfo pipe_ms_state_ci = {
- .sType = VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO,
+ const VkPipelineMultisampleStateCreateInfo pipe_ms_state_ci = {
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,
.pNext = NULL,
.rasterSamples = 4,
.multisampleEnable = 1,
@@ -1848,20 +1848,20 @@
.pSpecializationInfo = NULL,
};
const VkGraphicsPipelineCreateInfo gp_ci = {
- .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
- .pNext = NULL,
- .stageCount = 1,
- .pStages = &pipe_vs_ci,
- .pVertexInputState = NULL,
- .pIaState = NULL,
- .pTessState = NULL,
- .pVpState = NULL,
- .pRsState = NULL,
- .pMsState = &pipe_ms_state_ci,
- .pDsState = NULL,
- .pCbState = NULL,
- .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
- .layout = pipeline_layout,
+ .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+ .pNext = NULL,
+ .stageCount = 0,
+ .pStages = &pipe_vs_ci,
+ .pVertexInputState = NULL,
+ .pInputAssemblyState = NULL,
+ .pTessellationState = NULL,
+ .pViewportState = NULL,
+ .pRasterState = NULL,
+ .pMultisampleState = &pipe_ms_state_ci,
+ .pDepthStencilState = NULL,
+ .pColorBlendState = NULL,
+ .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+ .layout = pipeline_layout,
};
const VkPipelineCacheCreateInfo pc_ci = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
@@ -2009,8 +2009,8 @@
err = vkAllocDescriptorSets(m_device->device(), ds_pool, VK_DESCRIPTOR_SET_USAGE_ONE_SHOT, 1, &ds_layout, &descriptorSet, &ds_count);
ASSERT_VK_SUCCESS(err);
- const VkPipelineMsStateCreateInfo pipe_ms_state_ci = {
- .sType = VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO,
+ const VkPipelineMultisampleStateCreateInfo pipe_ms_state_ci = {
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,
.pNext = NULL,
.rasterSamples = 4,
.multisampleEnable = 1,
@@ -2071,20 +2071,20 @@
.pSpecializationInfo = NULL,
};
const VkGraphicsPipelineCreateInfo gp_ci = {
- .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
- .pNext = NULL,
- .stageCount = 1,
- .pStages = &pipe_vs_ci,
- .pVertexInputState = NULL,
- .pIaState = NULL,
- .pTessState = NULL,
- .pVpState = NULL,
- .pRsState = NULL,
- .pMsState = &pipe_ms_state_ci,
- .pDsState = NULL,
- .pCbState = NULL,
- .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
- .layout = pipeline_layout,
+ .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+ .pNext = NULL,
+ .stageCount = 0,
+ .pStages = &pipe_vs_ci,
+ .pVertexInputState = NULL,
+ .pInputAssemblyState = NULL,
+ .pTessellationState = NULL,
+ .pViewportState = NULL,
+ .pRasterState = NULL,
+ .pMultisampleState = &pipe_ms_state_ci,
+ .pDepthStencilState = NULL,
+ .pColorBlendState = NULL,
+ .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+ .layout = pipeline_layout,
};
const VkPipelineCacheCreateInfo pc_ci = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
@@ -2169,8 +2169,8 @@
err = vkAllocDescriptorSets(m_device->device(), ds_pool, VK_DESCRIPTOR_SET_USAGE_ONE_SHOT, 1, &ds_layout, &descriptorSet, &ds_count);
ASSERT_VK_SUCCESS(err);
- const VkPipelineMsStateCreateInfo pipe_ms_state_ci = {
- .sType = VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO,
+ const VkPipelineMultisampleStateCreateInfo pipe_ms_state_ci = {
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,
.pNext = NULL,
.rasterSamples = 1,
.multisampleEnable = 1,
@@ -2202,20 +2202,20 @@
.pSpecializationInfo = NULL,
};
const VkGraphicsPipelineCreateInfo gp_ci = {
- .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
- .pNext = NULL,
- .stageCount = 1,
- .pStages = &pipe_vs_ci,
- .pVertexInputState = NULL,
- .pIaState = NULL,
- .pTessState = NULL,
- .pVpState = NULL,
- .pRsState = NULL,
- .pMsState = &pipe_ms_state_ci,
- .pDsState = NULL,
- .pCbState = NULL,
- .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
- .layout = pipeline_layout,
+ .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+ .pNext = NULL,
+ .stageCount = 0,
+ .pStages = &pipe_vs_ci,
+ .pVertexInputState = NULL,
+ .pInputAssemblyState = NULL,
+ .pTessellationState = NULL,
+ .pViewportState = NULL,
+ .pRasterState = NULL,
+ .pMultisampleState = &pipe_ms_state_ci,
+ .pDepthStencilState = NULL,
+ .pColorBlendState = NULL,
+ .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+ .layout = pipeline_layout,
};
VkPipelineCacheCreateInfo pipelineCache;
diff --git a/tests/render_tests.cpp b/tests/render_tests.cpp
index 7d0749d..082280f 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -829,7 +829,7 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget(2));
- VkPipelineCbAttachmentState att = {};
+ VkPipelineColorBlendAttachmentState att = {};
att.blendEnable = VK_FALSE;
att.channelWriteMask = 0xf;
pipelineobj.AddColorAttachment(1, &att);
@@ -1859,7 +1859,7 @@
pipelineobj.AddShader(&vs);
pipelineobj.AddShader(&ps);
- VkPipelineDsStateCreateInfo ds_state;
+ VkPipelineDepthStencilStateCreateInfo ds_state;
ds_state.depthTestEnable = VK_TRUE;
ds_state.depthWriteEnable = VK_TRUE;
ds_state.depthCompareOp = VK_COMPARE_OP_LESS_EQUAL;
@@ -2802,7 +2802,7 @@
pipelineobj.AddVertexInputBindings(&vi_binding,1);
pipelineobj.AddVertexDataBuffer(&meshBuffer, MESH_BIND_ID);
- VkPipelineDsStateCreateInfo ds_state;
+ VkPipelineDepthStencilStateCreateInfo ds_state;
ds_state.depthTestEnable = VK_TRUE;
ds_state.depthWriteEnable = VK_TRUE;
ds_state.depthCompareOp = VK_COMPARE_OP_LESS_EQUAL;
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 4b45f10..3af63b4 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -1100,14 +1100,14 @@
m_vertexBufferCount = 0;
- m_ia_state.sType = VK_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO;
+ m_ia_state.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
m_ia_state.pNext = VK_NULL_HANDLE;
m_ia_state.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
m_ia_state.disableVertexReuse = VK_FALSE;
m_ia_state.primitiveRestartEnable = VK_FALSE;
m_ia_state.primitiveRestartIndex = 0;
- m_rs_state.sType = VK_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO;
+ m_rs_state.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO;
m_rs_state.pNext = VK_NULL_HANDLE;
m_rs_state.depthClipEnable = VK_FALSE;
m_rs_state.rasterizerDiscardEnable = VK_FALSE;
@@ -1118,26 +1118,26 @@
m_rs_state.frontFace = VK_FRONT_FACE_CW;
memset(&m_cb_state,0,sizeof(m_cb_state));
- m_cb_state.sType = VK_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO;
+ m_cb_state.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
m_cb_state.pNext = VK_NULL_HANDLE;
m_cb_state.alphaToCoverageEnable = VK_FALSE;
m_cb_state.logicOp = VK_LOGIC_OP_COPY;
m_ms_state.pNext = VK_NULL_HANDLE;
- m_ms_state.sType = VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO;
+ m_ms_state.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
m_ms_state.multisampleEnable = VK_FALSE;
m_ms_state.sampleMask = 1; // Do we have to specify MSAA even just to disable it?
m_ms_state.rasterSamples = 1;
m_ms_state.minSampleShading = 0;
m_ms_state.sampleShadingEnable = 0;
- m_vp_state.sType = VK_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO;
+ m_vp_state.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
m_vp_state.pNext = VK_NULL_HANDLE;
m_vp_state.viewportCount = 1;
m_vp_state.depthMode = VK_DEPTH_MODE_ZERO_TO_ONE;
m_vp_state.clipOrigin = VK_COORDINATE_ORIGIN_UPPER_LEFT;
- m_ds_state.sType = VK_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO;
+ m_ds_state.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
m_ds_state.pNext = VK_NULL_HANDLE,
m_ds_state.depthTestEnable = VK_FALSE;
m_ds_state.depthWriteEnable = VK_FALSE;
@@ -1175,7 +1175,7 @@
m_vertexBufferCount++;
}
-void VkPipelineObj::AddColorAttachment(uint32_t binding, const VkPipelineCbAttachmentState *att)
+void VkPipelineObj::AddColorAttachment(uint32_t binding, const VkPipelineColorBlendAttachmentState *att)
{
if (binding+1 > m_colorAttachments.size())
{
@@ -1184,7 +1184,7 @@
m_colorAttachments[binding] = *att;
}
-void VkPipelineObj::SetDepthStencil(VkPipelineDsStateCreateInfo *ds_state)
+void VkPipelineObj::SetDepthStencil(VkPipelineDepthStencilStateCreateInfo *ds_state)
{
m_ds_state.depthTestEnable = ds_state->depthTestEnable;
m_ds_state.depthWriteEnable = ds_state->depthWriteEnable;
@@ -1223,16 +1223,16 @@
m_cb_state.attachmentCount = m_colorAttachments.size();
m_cb_state.pAttachments = &m_colorAttachments[0];
- info.pTessState = NULL;
- info.pVertexInputState = &m_vi_state;
- info.pIaState = &m_ia_state;
- info.pVpState = &m_vp_state;
- info.pRsState = &m_rs_state;
- info.pMsState = &m_ms_state;
- info.pDsState = &m_ds_state;
- info.pCbState = &m_cb_state;
info.renderPass = render_pass;
info.subpass = 0;
+ info.pTessellationState = NULL;
+ info.pVertexInputState = &m_vi_state;
+ info.pInputAssemblyState = &m_ia_state;
+ info.pViewportState = &m_vp_state;
+ info.pRasterState = &m_rs_state;
+ info.pMultisampleState = &m_ms_state;
+ info.pDepthStencilState = &m_ds_state;
+ info.pColorBlendState = &m_cb_state;
return init_try(*m_device, info);
}
diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index bdf508e..34ef824 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -399,33 +399,33 @@
void AddVertexInputAttribs(VkVertexInputAttributeDescription* vi_attrib, int count);
void AddVertexInputBindings(VkVertexInputBindingDescription* vi_binding, int count);
void AddVertexDataBuffer(VkConstantBufferObj* vertexDataBuffer, int binding);
- void AddColorAttachment(uint32_t binding, const VkPipelineCbAttachmentState *att);
+ void AddColorAttachment(uint32_t binding, const VkPipelineColorBlendAttachmentState *att);
void AddColorAttachment()
{
- VkPipelineCbAttachmentState att = {};
+ VkPipelineColorBlendAttachmentState att = {};
att.blendEnable = VK_FALSE;
att.channelWriteMask = 0xf;
AddColorAttachment(0, &att);
}
- void SetDepthStencil(VkPipelineDsStateCreateInfo *);
+ void SetDepthStencil(VkPipelineDepthStencilStateCreateInfo *);
VkResult CreateVKPipeline(VkDescriptorSetObj &descriptorSet, VkRenderPass render_pass);
protected:
- VkPipelineVertexInputStateCreateInfo m_vi_state;
- VkPipelineIaStateCreateInfo m_ia_state;
- VkPipelineRsStateCreateInfo m_rs_state;
- VkPipelineCbStateCreateInfo m_cb_state;
- VkPipelineDsStateCreateInfo m_ds_state;
- VkPipelineVpStateCreateInfo m_vp_state;
- VkPipelineMsStateCreateInfo m_ms_state;
- VkDeviceObj *m_device;
- vector<VkShaderObj*> m_shaderObjs;
- vector<VkConstantBufferObj*> m_vertexBufferObjs;
- vector<int> m_vertexBufferBindings;
- vector<VkPipelineCbAttachmentState> m_colorAttachments;
- int m_vertexBufferCount;
+ VkPipelineVertexInputStateCreateInfo m_vi_state;
+ VkPipelineInputAssemblyStateCreateInfo m_ia_state;
+ VkPipelineRasterStateCreateInfo m_rs_state;
+ VkPipelineColorBlendStateCreateInfo m_cb_state;
+ VkPipelineDepthStencilStateCreateInfo m_ds_state;
+ VkPipelineViewportStateCreateInfo m_vp_state;
+ VkPipelineMultisampleStateCreateInfo m_ms_state;
+ VkDeviceObj *m_device;
+ vector<VkShaderObj*> m_shaderObjs;
+ vector<VkConstantBufferObj*> m_vertexBufferObjs;
+ vector<int> m_vertexBufferBindings;
+ vector<VkPipelineColorBlendAttachmentState> m_colorAttachments;
+ int m_vertexBufferCount;
};
#endif // VKRENDERFRAMEWORK_H