From f48700bc452c394c0d397a072e477d14c8ee5dca Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Tue, 10 Nov 2015 16:21:09 +0800
Subject: MR640: Alloc -> Allocate naming fixes

Drop a workaround in get_struct_name_from_struct_type in vk_helper.py.

s/VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO/VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO/g
s/VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOC_INFO/VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO/g
s/VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO/VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO/g

https://gitlab.khronos.org/vulkan/vulkan/merge_requests/640
---
 layers/param_checker.cpp | 4 ++--
 layers/screenshot.cpp    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'layers')

diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 369420df..1afa5dc1 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -2179,7 +2179,7 @@ bool PreAllocateMemory(
 {
     if(pAllocateInfo != nullptr)
     {
-    if(pAllocateInfo->sType != VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO)
+    if(pAllocateInfo->sType != VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO)
     {
         log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
         "vkAllocateMemory parameter, VkStructureType pAllocateInfo->sType, is an invalid enumerator");
@@ -4854,7 +4854,7 @@ bool PreCreateCommandBuffer(
 {
     if(pCreateInfo != nullptr)
     {
-    if(pCreateInfo->sType != VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO)
+    if(pCreateInfo->sType != VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO)
     {
         log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
         "vkAllocateCommandBuffers parameter, VkStructureType pCreateInfo->sType, is an invalid enumerator");
diff --git a/layers/screenshot.cpp b/layers/screenshot.cpp
index 56011561..b627c44d 100644
--- a/layers/screenshot.cpp
+++ b/layers/screenshot.cpp
@@ -165,13 +165,13 @@ static void writePPM( const char *filename, VkImage image1)
         (VK_IMAGE_USAGE_TRANSFER_DST_BIT|VK_IMAGE_USAGE_STORAGE_BIT),
     };
     VkMemoryAllocateInfo memAllocInfo = {
-        VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO,
+        VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
         NULL,
         0,     // allocationSize, queried later
         0      // memoryTypeIndex, queried later
     };
     const VkCommandBufferAllocateInfo allocCommandBufferInfo = {
-        VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOC_INFO,
+        VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO,
         NULL,
         deviceMap[device]->commandPool,
         VK_COMMAND_BUFFER_LEVEL_PRIMARY,
-- 
cgit v1.2.3