aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCourtney Goeltzenleuchter <courtney@LunarG.com>2015-06-18 17:28:20 -0600
committerCourtney Goeltzenleuchter <courtney@LunarG.com>2015-06-24 15:46:01 -0600
commita5fa53b8675cffc5d07450e6c8202f9821309385 (patch)
tree690f261c9e0935fedf4d9506f29efe283adcd208
parent9795a5629af84affc39cee421ecd35877948d91f (diff)
downloadusermoji-a5fa53b8675cffc5d07450e6c8202f9821309385.tar.xz
bug 14016: Make vkResetFences take const pFences
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14016
-rw-r--r--icd/nulldrv/nulldrv.c6
-rw-r--r--include/vulkan.h6
-rw-r--r--layers/mem_tracker.cpp2
-rw-r--r--layers/param_checker.cpp2
-rw-r--r--loader/trampoline.c2
-rwxr-xr-xvulkan.py2
6 files changed, 10 insertions, 10 deletions
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index d7902d19..f726b670 100644
--- 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 e3e25d94..4109b236 100644
--- 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 52b2e781..099a6b2e 100644
--- 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 822cb42d..0bed8691 100644
--- 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 0a1a1401..b5e5d7af 100644
--- 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 7fa074a1..e9905675 100755
--- 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"),