vulkan: Rename bindInfo to pBindInfo.

Conflicts:
	include/vulkan.h
	layers/param_checker.cpp

diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 6d1ed15c4c8d151e29b4967e8d1576197a1dda07..d6ce2e5d306ba3031e879c87e2e5123a7a604875 100644 (file)
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -1632,7 +1632,7 @@ ICD_EXPORT VkResult VKAPI vkQueueBindImageMemoryRange(
     VkQueue                                   queue,
     VkImage                                   image,
     uint32_t                                    allocationIdx,
-    const VkImageMemoryBindInfo*           bindInfo,
+    const VkImageMemoryBindInfo*           pBindInfo,
     VkGpuMemory                              mem,
     VkGpuSize                                memOffset)
 {

diff --git a/include/vulkan.h b/include/vulkan.h
index 0edbfcf8c1abdd22467e5f9867a13d36cdd8af5f..d80c15a28d2257ed7f4053698f526d10a4d123ff 100644 (file)
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -2229,7 +2229,7 @@ typedef VkResult (VKAPI *PFN_vkDestroyObject)(VkObject object);
 typedef VkResult (VKAPI *PFN_vkGetObjectInfo)(VkBaseObject object, VkObjectInfoType infoType, size_t* pDataSize, void* pData);
 typedef VkResult (VKAPI *PFN_vkQueueBindObjectMemory)(VkQueue queue, VkObject object, uint32_t allocationIdx, VkGpuMemory mem, VkGpuSize offset);
 typedef VkResult (VKAPI *PFN_vkQueueBindObjectMemoryRange)(VkQueue queue, VkObject object, uint32_t allocationIdx, VkGpuSize rangeOffset,VkGpuSize rangeSize, VkGpuMemory mem, VkGpuSize memOffset);
-typedef VkResult (VKAPI *PFN_vkQueueBindImageMemoryRange)(VkQueue queue, VkImage image, uint32_t allocationIdx, const VkImageMemoryBindInfo* bindInfo, VkGpuMemory mem, VkGpuSize memOffset);
+typedef VkResult (VKAPI *PFN_vkQueueBindImageMemoryRange)(VkQueue queue, VkImage image, uint32_t allocationIdx, const VkImageMemoryBindInfo* pBindInfo, VkGpuMemory mem, VkGpuSize memOffset);
 typedef VkResult (VKAPI *PFN_vkCreateFence)(VkDevice device, const VkFenceCreateInfo* pCreateInfo, VkFence* pFence);
 typedef VkResult (VKAPI *PFN_vkResetFences)(VkDevice device, uint32_t fenceCount, VkFence* pFences);
 typedef VkResult (VKAPI *PFN_vkGetFenceStatus)(VkFence fence);
@@ -2495,7 +2495,7 @@ VkResult VKAPI vkQueueBindImageMemoryRange(
     VkQueue                                     queue,
     VkImage                                     image,
     uint32_t                                    allocationIdx,
-    const VkImageMemoryBindInfo*                bindInfo,
+    const VkImageMemoryBindInfo*                pBindInfo,
     VkGpuMemory                                 mem,
     VkGpuSize                                   memOffset);
 

diff --git a/layers/glave_snapshot.c b/layers/glave_snapshot.c
index 3192a77756c2c00b98a77f3e1927ce745b7da4d1..1a399b95773481937c55af0db7d9dda28a3b0eb0 100644 (file)
--- a/layers/glave_snapshot.c
+++ b/layers/glave_snapshot.c
@@ -740,12 +740,12 @@ VK_LAYER_EXPORT VkResult VKAPI vkBindObjectMemoryRange(VkObject object, uint32_t
     return result;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkBindImageMemoryRange(VkImage image, uint32_t allocationIdx, const VkImageMemoryBindInfo* bindInfo, VkGpuMemory mem, VkGpuSize memOffset)
+VK_LAYER_EXPORT VkResult VKAPI vkBindImageMemoryRange(VkImage image, uint32_t allocationIdx, const VkImageMemoryBindInfo* pBindInfo, VkGpuMemory mem, VkGpuSize memOffset)
 {
     loader_platform_thread_lock_mutex(&objLock);
     ll_increment_use_count((void*)image, VK_OBJECT_TYPE_IMAGE);
     loader_platform_thread_unlock_mutex(&objLock);
-    VkResult result = nextTable.BindImageMemoryRange(image, allocationIdx, bindInfo, mem, memOffset);
+    VkResult result = nextTable.BindImageMemoryRange(image, allocationIdx, pBindInfo, mem, memOffset);
     return result;
 }
 

diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index f8562838e2213573963897992dd882d0f1ad2f1f..fae24d1c83b46c6e48a19803af03f08d8b8eaa85 100644 (file)
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -519,18 +519,18 @@ VK_LAYER_EXPORT VkResult VKAPI vkQueueBindObjectMemoryRange(VkQueue queue, VkObj
     return result;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkQueueBindImageMemoryRange(VkQueue queue, VkImage image, uint32_t allocationIdx, const VkImageMemoryBindInfo* bindInfo, VkGpuMemory mem, VkGpuSize memOffset)
+VK_LAYER_EXPORT VkResult VKAPI vkQueueBindImageMemoryRange(VkQueue queue, VkImage image, uint32_t allocationIdx, const VkImageMemoryBindInfo* pBindInfo, VkGpuMemory mem, VkGpuSize memOffset)
 {
     char str[1024];
-    if (!bindInfo) {
-        sprintf(str, "Struct ptr parameter bindInfo to function QueueBindImageMemoryRange is NULL.");
+    if (!pBindInfo) {
+        sprintf(str, "Struct ptr parameter pBindInfo to function QueueBindImageMemoryRange is NULL.");
         layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, NULL, 0, 1, "PARAMCHECK", str);
     }
-    else if (!vk_validate_vkimagememorybindinfo(bindInfo)) {
-        sprintf(str, "Parameter bindInfo to function BindImageMemoryRange contains an invalid value.");
+    else if (!vk_validate_vkimagememorybindinfo(pBindInfo)) {
+        sprintf(str, "Parameter pBindInfo to function BindImageMemoryRange contains an invalid value.");
         layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, NULL, 0, 1, "PARAMCHECK", str);
     }
-    VkResult result = nextTable.QueueBindImageMemoryRange(queue, image, allocationIdx, bindInfo, mem, memOffset);
+    VkResult result = nextTable.QueueBindImageMemoryRange(queue, image, allocationIdx, pBindInfo, mem, memOffset);
     return result;
 }
 

diff --git a/vulkan.py b/vulkan.py
index 56b95c27083c30800bd8ecbaf87d1424067a8d6b..4c51bd4c0f29e40e3f5b5b99dc3f95f532b49a5d 100755 (executable)
--- a/vulkan.py
+++ b/vulkan.py
@@ -379,7 +379,7 @@ core = Extension(
             [Param("VkQueue", "queue"),
              Param("VkImage", "image"),
              Param("uint32_t", "allocationIdx"),
-             Param("const VkImageMemoryBindInfo*", "bindInfo"),
+             Param("const VkImageMemoryBindInfo*", "pBindInfo"),
              Param("VkGpuMemory", "mem"),
              Param("VkGpuSize", "memOffset")]),