bug 14016: Make vkResetFences take const pFences

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14016

diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index d7902d19b4a1329e91ccb02bf80a862945da8bca..f726b6704cf09e8047b5c21e224ef4fbaa4dbaa8 100644 (file)
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -1385,9 +1385,9 @@ ICD_EXPORT VkResult VKAPI vkGetFenceStatus(
 }
 
 ICD_EXPORT VkResult VKAPI vkResetFences(
-    VkDevice                                  device,
-    uint32_t                                   fenceCount,
-    VkFence*                                  pFences)
+    VkDevice                    device,
+    uint32_t                    fenceCount,
+    const VkFence*              pFences)
 {
     NULLDRV_LOG_FUNC;
     return VK_SUCCESS;

diff --git a/include/vulkan.h b/include/vulkan.h
index e3e25d94c0abd53d518d0ff152010c5bec82fb2c..4109b236186a6cbc344d7f13ce4d109e77008027 100644 (file)
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -33,7 +33,7 @@
 #include "vk_platform.h"
 
 // Vulkan API version supported by this file
-#define VK_API_VERSION VK_MAKE_VERSION(0, 105, 0)
+#define VK_API_VERSION VK_MAKE_VERSION(0, 106, 0)
 
 #ifdef __cplusplus
 extern "C"
@@ -2069,7 +2069,7 @@ typedef VkResult (VKAPI *PFN_vkBindObjectMemory)(VkDevice device, VkObjectType o
 typedef VkResult (VKAPI *PFN_vkQueueBindSparseBufferMemory)(VkQueue queue, VkBuffer buffer, VkDeviceSize rangeOffset, VkDeviceSize rangeSize, VkDeviceMemory mem, VkDeviceSize memOffset);
 typedef VkResult (VKAPI *PFN_vkQueueBindSparseImageMemory)(VkQueue queue, VkImage image, const VkImageMemoryBindInfo* pBindInfo, VkDeviceMemory mem, VkDeviceSize 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_vkResetFences)(VkDevice device, uint32_t fenceCount, const VkFence* pFences);
 typedef VkResult (VKAPI *PFN_vkGetFenceStatus)(VkDevice device, VkFence fence);
 typedef VkResult (VKAPI *PFN_vkWaitForFences)(VkDevice device, uint32_t fenceCount, const VkFence* pFences, bool32_t waitAll, uint64_t timeout);
 typedef VkResult (VKAPI *PFN_vkCreateSemaphore)(VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, VkSemaphore* pSemaphore);
@@ -2318,7 +2318,7 @@ VkResult VKAPI vkCreateFence(
 VkResult VKAPI vkResetFences(
     VkDevice                                    device,
     uint32_t                                    fenceCount,
-    VkFence*                                    pFences);
+    const VkFence*                              pFences);
 
 VkResult VKAPI vkGetFenceStatus(
     VkDevice                                    device,

diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 52b2e781998610733c10a0182ef952bb44f6b1d8..099a6b2eace3e28fa427c517742c8d751a97d5c1 100644 (file)
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1291,7 +1291,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateFence(
 VK_LAYER_EXPORT VkResult VKAPI vkResetFences(
     VkDevice  device,
     uint32_t  fenceCount,
-    VkFence  *pFences)
+    const VkFence  *pFences)
 {
     /*
      * TODO: Shouldn't we check for error conditions before passing down the chain?

diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 822cb42d21fa3b4da3d40a5d1055338677fa7fb5..0bed8691b74d91960bef0ecea3007c21d8e497fd 100644 (file)
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -550,7 +550,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkWaitForFences(VkDevice device, uint32_t fenceCo
     return result;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkResetFences(VkDevice device, uint32_t fenceCount, VkFence* pFences)
+VK_LAYER_EXPORT VkResult VKAPI vkResetFences(VkDevice device, uint32_t fenceCount, const VkFence* pFences)
 {
 
     VkResult result = device_dispatch_table(device)->ResetFences(device, fenceCount, pFences);

diff --git a/loader/trampoline.c b/loader/trampoline.c
index 0a1a1401001fd6d9b1f1d1574b6e963baf17aaef..b5e5d7aff41c49e300e87109ee9b154433cb9205 100644 (file)
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -409,7 +409,7 @@ LOADER_EXPORT VkResult VKAPI vkCreateFence(VkDevice device, const VkFenceCreateI
     return disp->CreateFence(device, pCreateInfo, pFence);
 }
 
-LOADER_EXPORT VkResult VKAPI vkResetFences(VkDevice device, uint32_t fenceCount, VkFence* pFences)
+LOADER_EXPORT VkResult VKAPI vkResetFences(VkDevice device, uint32_t fenceCount, const VkFence* pFences)
 {
     const VkLayerDispatchTable *disp;
 

diff --git a/vulkan.py b/vulkan.py
index 7fa074a139d737f4393eed24a71540469ab240fc..e990567547a98af9cd86f77cb83e9f892e05ca53 100755 (executable)
--- a/vulkan.py
+++ b/vulkan.py
@@ -369,7 +369,7 @@ core = Extension(
         Proto("VkResult", "ResetFences",
             [Param("VkDevice", "device"),
              Param("uint32_t", "fenceCount"),
-             Param("VkFence*", "pFences")]),
+             Param("const VkFence*", "pFences")]),
 
         Proto("VkResult", "GetFenceStatus",
             [Param("VkDevice", "device"),