Bug 14224: Remove abbreviations on some API symbols
diff --git a/demos/cube.c b/demos/cube.c
index ce36b06..caaae79 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -1401,12 +1401,12 @@
{
VkGraphicsPipelineCreateInfo pipeline;
VkPipelineCacheCreateInfo pipelineCache;
- VkPipelineIaStateCreateInfo ia;
- VkPipelineRsStateCreateInfo rs;
- VkPipelineCbStateCreateInfo cb;
- VkPipelineDsStateCreateInfo ds;
- VkPipelineVpStateCreateInfo vp;
- VkPipelineMsStateCreateInfo ms;
+ VkPipelineInputAssemblyStateCreateInfo ia;
+ VkPipelineRasterStateCreateInfo rs;
+ VkPipelineColorBlendStateCreateInfo cb;
+ VkPipelineDepthStencilStateCreateInfo ds;
+ VkPipelineViewportStateCreateInfo vp;
+ VkPipelineMultisampleStateCreateInfo ms;
VkResult U_ASSERT_ONLY err;
memset(&pipeline, 0, sizeof(pipeline));
@@ -1414,19 +1414,19 @@
pipeline.layout = demo->pipeline_layout;
memset(&ia, 0, sizeof(ia));
- ia.sType = VK_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO;
+ ia.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
ia.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
memset(&rs, 0, sizeof(rs));
- rs.sType = VK_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO;
+ rs.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO;
rs.fillMode = VK_FILL_MODE_SOLID;
rs.cullMode = VK_CULL_MODE_BACK;
rs.frontFace = VK_FRONT_FACE_CCW;
rs.depthClipEnable = VK_TRUE;
memset(&cb, 0, sizeof(cb));
- cb.sType = VK_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO;
- VkPipelineCbAttachmentState att_state[1];
+ 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].blendEnable = VK_FALSE;
@@ -1434,11 +1434,11 @@
cb.pAttachments = att_state;
memset(&vp, 0, sizeof(vp));
- vp.sType = VK_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO;
+ vp.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
vp.viewportCount = 1;
memset(&ds, 0, sizeof(ds));
- ds.sType = VK_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO;
+ ds.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
ds.depthTestEnable = VK_TRUE;
ds.depthWriteEnable = VK_TRUE;
ds.depthCompareOp = VK_COMPARE_OP_LESS_EQUAL;
@@ -1450,7 +1450,7 @@
ds.front = ds.back;
memset(&ms, 0, sizeof(ms));
- ms.sType = VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO;
+ ms.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
ms.sampleMask = 1;
ms.multisampleEnable = VK_FALSE;
ms.rasterSamples = 1;
@@ -1468,22 +1468,21 @@
shaderStages[1].stage = VK_SHADER_STAGE_FRAGMENT;
shaderStages[1].shader = demo_prepare_fs(demo);
- pipeline.pVertexInputState = NULL;
- pipeline.pIaState = &ia;
- pipeline.pRsState = &rs;
- pipeline.pCbState = &cb;
- pipeline.pMsState = &ms;
- pipeline.pVpState = &vp;
- pipeline.pDsState = &ds;
- pipeline.pStages = shaderStages;
- pipeline.renderPass = demo->render_pass;
- pipeline.subpass = 0;
-
memset(&pipelineCache, 0, sizeof(pipelineCache));
pipelineCache.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO;
err = vkCreatePipelineCache(demo->device, &pipelineCache, &demo->pipelineCache);
assert(!err);
+
+ pipeline.pVertexInputState = NULL;
+ pipeline.pInputAssemblyState = &ia;
+ pipeline.pRasterState = &rs;
+ pipeline.pColorBlendState = &cb;
+ pipeline.pMultisampleState = &ms;
+ pipeline.pViewportState = &vp;
+ pipeline.pDepthStencilState = &ds;
+ pipeline.pStages = shaderStages;
+
err = vkCreateGraphicsPipelines(demo->device, demo->pipelineCache, 1, &pipeline, &demo->pipeline);
assert(!err);