From b8b0a84b90e0f764ca1922b4909bc7b24e7aaa18 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Wed, 19 Jul 2017 13:03:22 -0600 Subject: layers: Update API for vulkan parameter def change One of the DebugMarkerSetObjectName parameters changes to const. Change-Id: I23455957b83a84983bc7217a2a0d937ae03055e2 --- layers/core_validation.cpp | 2 +- layers/object_tracker.h | 2 +- layers/object_tracker_utils.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 57f9d4ef..ad647e8a 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -10262,7 +10262,7 @@ VKAPI_ATTR VkResult VKAPI_CALL GetDisplayPlaneCapabilitiesKHR(VkPhysicalDevice p return result; } -VKAPI_ATTR VkResult VKAPI_CALL DebugMarkerSetObjectNameEXT(VkDevice device, VkDebugMarkerObjectNameInfoEXT *pNameInfo) { +VKAPI_ATTR VkResult VKAPI_CALL DebugMarkerSetObjectNameEXT(VkDevice device, const VkDebugMarkerObjectNameInfoEXT *pNameInfo) { std::unique_lock lock(global_lock); layer_data *device_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map); if (pNameInfo->pObjectName) { diff --git a/layers/object_tracker.h b/layers/object_tracker.h index dc32b205..c9355757 100644 --- a/layers/object_tracker.h +++ b/layers/object_tracker.h @@ -189,7 +189,7 @@ VKAPI_ATTR void VKAPI_CALL DestroyCommandPool(VkDevice device, VkCommandPool com VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceQueueFamilyProperties2KHR(VkPhysicalDevice physicalDevice, uint32_t *pQueueFamilyPropertyCount, VkQueueFamilyProperties2KHR *pQueueFamilyProperties); -VKAPI_ATTR VkResult VKAPI_CALL DebugMarkerSetObjectNameEXT(VkDevice device, VkDebugMarkerObjectNameInfoEXT *pNameInfo); +VKAPI_ATTR VkResult VKAPI_CALL DebugMarkerSetObjectNameEXT(VkDevice device, const VkDebugMarkerObjectNameInfoEXT *pNameInfo); VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL GetPhysicalDeviceProcAddr(VkInstance instance, const char *funcName); VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pCount, VkExtensionProperties *pProperties); diff --git a/layers/object_tracker_utils.cpp b/layers/object_tracker_utils.cpp index 125ed55d..96ac95e4 100644 --- a/layers/object_tracker_utils.cpp +++ b/layers/object_tracker_utils.cpp @@ -940,7 +940,7 @@ VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceQueueFamilyProperties2KHR(VkPhysical } } -VKAPI_ATTR VkResult VKAPI_CALL DebugMarkerSetObjectNameEXT(VkDevice device, VkDebugMarkerObjectNameInfoEXT *pNameInfo) { +VKAPI_ATTR VkResult VKAPI_CALL DebugMarkerSetObjectNameEXT(VkDevice device, const VkDebugMarkerObjectNameInfoEXT *pNameInfo) { bool skip = VK_FALSE; std::unique_lock lock(global_lock); layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map); -- cgit v1.2.3