From 6d29a412f24aeb945f537c0b47a0dd7cf3a24a07 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 25 May 2015 16:22:52 +0800 Subject: v98: rename count to arraySize in VkDescriptorSetLayoutBinding Conflicts: include/vulkan.h --- layers/draw_state.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'layers/draw_state.cpp') diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 20ccd701..28951327 100755 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -676,7 +676,7 @@ static uint32_t getBindingStartIndex(const LAYOUT_NODE* pLayout, const uint32_t { uint32_t offsetIndex = 0; for (uint32_t i = 0; icreateInfo.pBinding[i].count; + offsetIndex += pLayout->createInfo.pBinding[i].arraySize; } return offsetIndex; } @@ -685,7 +685,7 @@ static uint32_t getBindingEndIndex(const LAYOUT_NODE* pLayout, const uint32_t bi { uint32_t offsetIndex = 0; for (uint32_t i = 0; i<=binding; i++) { - offsetIndex += pLayout->createInfo.pBinding[i].count; + offsetIndex += pLayout->createInfo.pBinding[i].arraySize; } return offsetIndex-1; } @@ -1737,11 +1737,11 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(VkDevice device, cons memcpy((void*)pNewNode->createInfo.pBinding, pCreateInfo->pBinding, sizeof(VkDescriptorSetLayoutBinding)*pCreateInfo->count); uint32_t totalCount = 0; for (uint32_t i=0; icount; i++) { - totalCount += pCreateInfo->pBinding[i].count; + totalCount += pCreateInfo->pBinding[i].arraySize; if (pCreateInfo->pBinding[i].pImmutableSamplers) { VkSampler** ppIS = (VkSampler**)&pNewNode->createInfo.pBinding[i].pImmutableSamplers; - *ppIS = new VkSampler[pCreateInfo->pBinding[i].count]; - memcpy(*ppIS, pCreateInfo->pBinding[i].pImmutableSamplers, pCreateInfo->pBinding[i].count*sizeof(VkSampler)); + *ppIS = new VkSampler[pCreateInfo->pBinding[i].arraySize]; + memcpy(*ppIS, pCreateInfo->pBinding[i].pImmutableSamplers, pCreateInfo->pBinding[i].arraySize*sizeof(VkSampler)); } } if (totalCount > 0) { @@ -1749,7 +1749,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(VkDevice device, cons uint32_t offset = 0; uint32_t j = 0; for (uint32_t i=0; icount; i++) { - for (j = 0; j < pCreateInfo->pBinding[i].count; j++) { + for (j = 0; j < pCreateInfo->pBinding[i].arraySize; j++) { pNewNode->pTypes[offset + j] = pCreateInfo->pBinding[i].descriptorType; } offset += j; -- cgit v1.2.3