commit 2ca1bd55bc4f2320e16ea3553117252017921008
author Jesse Hall <jessehall@google.com> Wed Dec 02 15:40:12 2015 -0800
committer Jesse Hall <jessehall@google.com> Mon Jan 25 13:49:31 2016 -0800
tree 3e526e07f5d0fc662398af438714b1bd1b8ba25c
parent e6839555def32ba50cff1cd3184db76bd9c02bdb

libvulkan: Fix missed vkAllocateCommandBuffers renames

Change-Id: Ic3fee0d565009327f524084b14da498c8412155f
(cherry picked from commit 3b8513e831673417af2ad79baa6c73710742fa0f)

vulkan/libvulkan/entry.cpp

diff --git a/vulkan/libvulkan/entry.cpp b/vulkan/libvulkan/entry.cpp
index 9c0444f..77dceef 100644
--- a/vulkan/libvulkan/entry.cpp
+++ b/vulkan/libvulkan/entry.cpp
@@ -483,7 +483,7 @@
 
 __attribute__((visibility("default")))
 VKAPI_ATTR VkResult vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo* pAllocateInfo, VkCommandBuffer* pCommandBuffers) {
-    return GetVtbl(device).AllocateCommandBuffers(device, pAllocateInfo, pCommandBuffers);
+    return vulkan::AllocateCommandBuffers(device, pAllocateInfo, pCommandBuffers);
 }
 
 __attribute__((visibility("default")))

vulkan/libvulkan/entry.cpp.tmpl

diff --git a/vulkan/libvulkan/entry.cpp.tmpl b/vulkan/libvulkan/entry.cpp.tmpl
index 5047741..c11b232 100644
--- a/vulkan/libvulkan/entry.cpp.tmpl
+++ b/vulkan/libvulkan/entry.cpp.tmpl
@@ -109,7 +109,7 @@
 */}}
 {{define "IsSpecialEntry"}}
   {{/* TODO: figure out how to do this in a cleaner or at least multi-line way */}}
-  {{if or (eq $ "vkGetInstanceProcAddr") (or (eq $ "vkGetDeviceProcAddr") (or (eq $ "vkGetDeviceQueue") (or (eq $ "vkCreateCommandBuffer") (eq $ "vkDestroyDevice"))))}}
+  {{if or (eq $ "vkGetInstanceProcAddr") (or (eq $ "vkGetDeviceProcAddr") (or (eq $ "vkGetDeviceQueue") (or (eq $ "vkAllocateCommandBuffers") (eq $ "vkDestroyDevice"))))}}
     true
   {{end}}
 {{end}}

vulkan/libvulkan/loader.cpp

diff --git a/vulkan/libvulkan/loader.cpp b/vulkan/libvulkan/loader.cpp
index 2d45558..defd691 100644
--- a/vulkan/libvulkan/loader.cpp
+++ b/vulkan/libvulkan/loader.cpp
@@ -1121,8 +1121,8 @@
     if (strcmp(name, "vkGetDeviceQueue") == 0) {
         return reinterpret_cast<PFN_vkVoidFunction>(GetDeviceQueue);
     }
-    if (strcmp(name, "vkAllocCommandBuffers") == 0) {
-        return reinterpret_cast<PFN_vkVoidFunction>(AllocCommandBuffers);
+    if (strcmp(name, "vkAllocateCommandBuffers") == 0) {
+        return reinterpret_cast<PFN_vkVoidFunction>(AllocateCommandBuffers);
     }
     if (strcmp(name, "vkDestroyDevice") == 0) {
         return reinterpret_cast<PFN_vkVoidFunction>(DestroyDevice);
@@ -1146,9 +1146,9 @@
     *out_queue = queue;
 }
 
-VkResult AllocCommandBuffers(VkDevice device,
-                             const VkCommandBufferAllocateInfo* alloc_info,
-                             VkCommandBuffer* cmdbufs) {
+VkResult AllocateCommandBuffers(VkDevice device,
+                                const VkCommandBufferAllocateInfo* alloc_info,
+                                VkCommandBuffer* cmdbufs) {
     const DeviceVtbl* vtbl = GetVtbl(device);
     VkResult result = vtbl->AllocateCommandBuffers(device, alloc_info, cmdbufs);
     if (result != VK_SUCCESS)

vulkan/libvulkan/loader.h

diff --git a/vulkan/libvulkan/loader.h b/vulkan/libvulkan/loader.h
index 1f777fc..e007f8d 100644
--- a/vulkan/libvulkan/loader.h
+++ b/vulkan/libvulkan/loader.h
@@ -220,9 +220,9 @@
                     uint32_t family,
                     uint32_t index,
                     VkQueue* out_queue);
-VkResult AllocCommandBuffers(VkDevice device,
-                             const VkCommandBufferAllocateInfo* alloc_info,
-                             VkCommandBuffer* cmdbufs);
+VkResult AllocateCommandBuffers(VkDevice device,
+                                const VkCommandBufferAllocateInfo* alloc_info,
+                                VkCommandBuffer* cmdbufs);
 VkResult DestroyDevice(VkDevice drv_device,
                        const VkAllocationCallbacks* allocator);