commit e307f588ada2a959cab1964216a66934e5f8ab9e
author Tony Barbour <tony@LunarG.com> Fri Jul 10 15:29:03 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Jul 17 10:05:19 2015 -0600
tree a2f5976f234c053d8e565e941e01500b6e6f1853
parent d3945ccd5efe7531794a402b766d7eec9a1d9bab

Bug 14224: Remove abbreviations on some API symbols

icd/intel/pipeline.c

diff --git a/icd/intel/pipeline.c b/icd/intel/pipeline.c
index c7d6116..50ba4e9 100644
--- a/icd/intel/pipeline.c
+++ b/icd/intel/pipeline.c
@@ -111,23 +111,23 @@
 }
 
 struct intel_pipeline_create_info {
-    VkGraphicsPipelineCreateInfo         graphics;
-    VkPipelineVertexInputStateCreateInfo vi;
-    VkPipelineIaStateCreateInfo          ia;
-    VkPipelineDsStateCreateInfo          db;
-    VkPipelineCbStateCreateInfo          cb;
-    VkPipelineRsStateCreateInfo          rs;
-    VkPipelineTessStateCreateInfo        tess;
-    VkPipelineMsStateCreateInfo          ms;
-    VkPipelineVpStateCreateInfo          vp;
+    VkGraphicsPipelineCreateInfo           graphics;
+    VkPipelineVertexInputStateCreateInfo   vi;
+    VkPipelineInputAssemblyStateCreateInfo ia;
+    VkPipelineDepthStencilStateCreateInfo  db;
+    VkPipelineColorBlendStateCreateInfo    cb;
+    VkPipelineRasterStateCreateInfo        rs;
+    VkPipelineTessellationStateCreateInfo  tess;
+    VkPipelineMultisampleStateCreateInfo   ms;
+    VkPipelineViewportStateCreateInfo      vp;
 
-    VkComputePipelineCreateInfo          compute;
+    VkComputePipelineCreateInfo            compute;
 
-    VkPipelineShaderStageCreateInfo      vs;
-    VkPipelineShaderStageCreateInfo      tcs;
-    VkPipelineShaderStageCreateInfo      tes;
-    VkPipelineShaderStageCreateInfo      gs;
-    VkPipelineShaderStageCreateInfo      fs;
+    VkPipelineShaderStageCreateInfo        vs;
+    VkPipelineShaderStageCreateInfo        tcs;
+    VkPipelineShaderStageCreateInfo        tes;
+    VkPipelineShaderStageCreateInfo        gs;
+    VkPipelineShaderStageCreateInfo        fs;
 };
 
 /* in S1.3 */
@@ -361,7 +361,7 @@
 static VkResult pipeline_build_rs_state(struct intel_pipeline *pipeline,
                                           const struct intel_pipeline_create_info* info)
 {
-    const VkPipelineRsStateCreateInfo *rs_state = &info->rs;
+    const VkPipelineRasterStateCreateInfo *rs_state = &info->rs;
     bool ccw;
 
     pipeline->depthClipEnable = rs_state->depthClipEnable;
@@ -1048,7 +1048,7 @@
     uint32_t *dw = pipeline->cmd_cb;
 
     for (i = 0; i < info->cb.attachmentCount; i++) {
-        const VkPipelineCbAttachmentState *att = &info->cb.pAttachments[i];
+        const VkPipelineColorBlendAttachmentState *att = &info->cb.pAttachments[i];
         uint32_t dw0, dw1;
 
 
@@ -1242,29 +1242,29 @@
     if (vkinfo->pVertexInputState != NULL) {
         memcpy(&info->vi, vkinfo->pVertexInputState, sizeof (info->vi));
     }
-    if (vkinfo->pIaState != NULL) {
-        memcpy(&info->ia, vkinfo->pIaState, sizeof (info->ia));
+    if (vkinfo->pInputAssemblyState != NULL) {
+        memcpy(&info->ia, vkinfo->pInputAssemblyState, sizeof (info->ia));
     }
-    if (vkinfo->pDsState != NULL) {
-        memcpy(&info->db, vkinfo->pDsState, sizeof (info->db));
+    if (vkinfo->pDepthStencilState != NULL) {
+        memcpy(&info->db, vkinfo->pDepthStencilState, sizeof (info->db));
     }
-    if (vkinfo->pCbState != NULL) {
-        memcpy(&info->cb, vkinfo->pCbState, sizeof (info->cb));
+    if (vkinfo->pColorBlendState != NULL) {
+        memcpy(&info->cb, vkinfo->pColorBlendState, sizeof (info->cb));
     }
-    if (vkinfo->pRsState != NULL) {
-        memcpy(&info->rs, vkinfo->pRsState, sizeof (info->rs));
+    if (vkinfo->pRasterState != NULL) {
+        memcpy(&info->rs, vkinfo->pRasterState, sizeof (info->rs));
     }
-    if (vkinfo->pTessState != NULL) {
-        memcpy(&info->tess, vkinfo->pTessState, sizeof (info->tess));
+    if (vkinfo->pTessellationState != NULL) {
+        memcpy(&info->tess, vkinfo->pTessellationState, sizeof (info->tess));
     }
-    if (vkinfo->pMsState != NULL) {
-        memcpy(&info->ms, vkinfo->pMsState, sizeof (info->ms));
+    if (vkinfo->pMultisampleState != NULL) {
+        memcpy(&info->ms, vkinfo->pMultisampleState, sizeof (info->ms));
     }
-    if (vkinfo->pVpState != NULL) {
-        memcpy(&info->vp, vkinfo->pVpState, sizeof (info->vp));
+    if (vkinfo->pViewportState != NULL) {
+        memcpy(&info->vp, vkinfo->pViewportState, sizeof (info->vp));
     }
-    if (vkinfo->pVpState != NULL) {
-        memcpy(&info->vp, vkinfo->pVpState, sizeof (info->vp));
+    if (vkinfo->pViewportState != NULL) {
+        memcpy(&info->vp, vkinfo->pViewportState, sizeof (info->vp));
     }
 
     return VK_SUCCESS;