commit 6de6b0b93a1704d673c42fea1f0e3e4e720a14ff
author Cody Northrop <cody@lunarg.com> Tue Aug 04 11:16:41 2015 -0600
committer Cody Northrop <cody@lunarg.com> Tue Aug 04 17:37:03 2015 -0600
tree 2623f9d04b7699e354c2f0077a84d3109d0c07d3
parent f110c6ea46391b57f30588bbda17e7183e8c5bd7

v143: Bug 14277 - Follow pointer naming convention in VkSubpassDescription

layers/draw_state.cpp

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index b8b9df1..2ced664 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -644,10 +644,10 @@
             for (i = 0; i < pSD->colorCount; i++) {
                 uint32_t samples;
 
-                if (pSD->colorAttachments[i].attachment == VK_ATTACHMENT_UNUSED)
+                if (pSD->pColorAttachments[i].attachment == VK_ATTACHMENT_UNUSED)
                     continue;
 
-                samples = pRPCI->pAttachments[pSD->colorAttachments[i].attachment].samples;
+                samples = pRPCI->pAttachments[pSD->pColorAttachments[i].attachment].samples;
                 if (subpassNumSamples == 0) {
                     subpassNumSamples = samples;
                 } else if (subpassNumSamples != samples) {
@@ -2808,30 +2808,30 @@
             for (uint32_t i = 0; i < localRPCI->subpassCount; i++) {
                 VkSubpassDescription *subpass = (VkSubpassDescription *) &localRPCI->pSubpasses[i];
                 const uint32_t attachmentCount = subpass->inputCount +
-                    subpass->colorCount * (1 + (subpass->resolveAttachments?1:0)) +
+                    subpass->colorCount * (1 + (subpass->pResolveAttachments?1:0)) +
                     subpass->preserveCount;
                 VkAttachmentReference *attachments = new VkAttachmentReference[attachmentCount];
 
-                memcpy(attachments, subpass->inputAttachments,
+                memcpy(attachments, subpass->pInputAttachments,
                         sizeof(attachments[0]) * subpass->inputCount);
-                subpass->inputAttachments = attachments;
+                subpass->pInputAttachments = attachments;
                 attachments += subpass->inputCount;
 
-                memcpy(attachments, subpass->colorAttachments,
+                memcpy(attachments, subpass->pColorAttachments,
                         sizeof(attachments[0]) * subpass->colorCount);
-                subpass->colorAttachments = attachments;
+                subpass->pColorAttachments = attachments;
                 attachments += subpass->colorCount;
 
-                if (subpass->resolveAttachments) {
-                    memcpy(attachments, subpass->resolveAttachments,
+                if (subpass->pResolveAttachments) {
+                    memcpy(attachments, subpass->pResolveAttachments,
                             sizeof(attachments[0]) * subpass->colorCount);
-                    subpass->resolveAttachments = attachments;
+                    subpass->pResolveAttachments = attachments;
                     attachments += subpass->colorCount;
                 }
 
-                memcpy(attachments, subpass->preserveAttachments,
+                memcpy(attachments, subpass->pPreserveAttachments,
                         sizeof(attachments[0]) * subpass->preserveCount);
-                subpass->preserveAttachments = attachments;
+                subpass->pPreserveAttachments = attachments;
             }
         }
         if (pCreateInfo->pDependencies) {