diff options
| author | Courtney Goeltzenleuchter <courtneygo@google.com> | 2015-11-25 11:38:54 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-12-15 09:04:00 -0700 |
| commit | c7403b4294352708dfe1e69c30009cc575bb1359 (patch) | |
| tree | e66da072d6c4f8bbf7421d7f324eab57e934983a /include | |
| parent | 1573582e3bee0ed2c92af3d82a43fb49b1dde1fc (diff) | |
| download | usermoji-c7403b4294352708dfe1e69c30009cc575bb1359.tar.xz | |
layers: rename VkDbgObjectType
VkDebugReportObjectTypeLUNARG fits the extension naming requirements
Diffstat (limited to 'include')
| -rw-r--r-- | include/vulkan/vk_lunarg_debug_marker.h | 8 | ||||
| -rw-r--r-- | include/vulkan/vk_lunarg_debug_report.h | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/vulkan/vk_lunarg_debug_marker.h b/include/vulkan/vk_lunarg_debug_marker.h index 9e427803..c3c55252 100644 --- a/include/vulkan/vk_lunarg_debug_marker.h +++ b/include/vulkan/vk_lunarg_debug_marker.h @@ -62,8 +62,8 @@ extern "C" typedef void (VKAPI_PTR *PFN_vkCmdDbgMarkerBegin)(VkCommandBuffer commandBuffer, const char* pMarker); typedef void (VKAPI_PTR *PFN_vkCmdDbgMarkerEnd)(VkCommandBuffer commandBuffer); -typedef VkResult (VKAPI_PTR *PFN_vkDbgSetObjectTag)(VkDevice device, VkDbgObjectType objType, uint64_t object, size_t tagSize, const void* pTag); -typedef VkResult (VKAPI_PTR *PFN_vkDbgSetObjectName)(VkDevice device, VkDbgObjectType objType, uint64_t object, size_t nameSize, const char* pName); +typedef VkResult (VKAPI_PTR *PFN_vkDbgSetObjectTag)(VkDevice device, VkDebugReportObjectTypeLUNARG objType, uint64_t object, size_t tagSize, const void* pTag); +typedef VkResult (VKAPI_PTR *PFN_vkDbgSetObjectName)(VkDevice device, VkDebugReportObjectTypeLUNARG objType, uint64_t object, size_t nameSize, const char* pName); #ifdef VK_PROTOTYPES @@ -77,14 +77,14 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDbgMarkerEnd( VKAPI_ATTR VkResult VKAPI_CALL vkDbgSetObjectTag( VkDevice device, - VkDbgObjectType objType, + VkDebugReportObjectTypeLUNARG objType, uint64_t object, size_t tagSize, const void* pTag); VKAPI_ATTR VkResult VKAPI_CALL vkDbgSetObjectName( VkDevice device, - VkDbgObjectType objType, + VkDebugReportObjectTypeLUNARG objType, uint64_t object, size_t nameSize, const char* pName); diff --git a/include/vulkan/vk_lunarg_debug_report.h b/include/vulkan/vk_lunarg_debug_report.h index dfd27c55..53ceae5a 100644 --- a/include/vulkan/vk_lunarg_debug_report.h +++ b/include/vulkan/vk_lunarg_debug_report.h @@ -80,7 +80,7 @@ typedef enum { VK_OBJECT_TYPE_END_RANGE = VK_OBJECT_TYPE_COMMAND_POOL, VK_OBJECT_TYPE_NUM = (VK_OBJECT_TYPE_COMMAND_POOL - VK_OBJECT_TYPE_INSTANCE + 1), VK_OBJECT_TYPE_MAX_ENUM = 0x7FFFFFFF -} VkDbgObjectType; +} VkDebugReportObjectTypeLUNARG; #define VK_DEBUG_REPORT_EXTENSION_NAME "DEBUG_REPORT" @@ -108,7 +108,7 @@ typedef enum _DEBUG_REPORT_ERROR #define VK_DEBUG_REPORT_ENUM_EXTEND(type, id) ((type)(VK_DEBUG_REPORT_EXTENSION_NUMBER * -1000 + (id))) -#define VK_OBJECT_TYPE_MSG_CALLBACK VK_DEBUG_REPORT_ENUM_EXTEND(VkDbgObjectType, 0) +#define VK_OBJECT_TYPE_MSG_CALLBACK VK_DEBUG_REPORT_ENUM_EXTEND(VkDebugReportObjectTypeLUNARG, 0) #define VK_ERROR_VALIDATION_FAILED VK_DEBUG_REPORT_ENUM_EXTEND(VkResult, 0) // ------------------------------------------------------------------------------------------------ @@ -116,7 +116,7 @@ typedef enum _DEBUG_REPORT_ERROR typedef VkBool32 (*PFN_vkDbgMsgCallback)( VkFlags msgFlags, - VkDbgObjectType objType, + VkDebugReportObjectTypeLUNARG objType, uint64_t srcObject, size_t location, int32_t msgCode, @@ -147,7 +147,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback( // DebugReport utility callback functions VKAPI_ATTR void VKAPI_CALL vkDbgStringCallback( VkFlags msgFlags, - VkDbgObjectType objType, + VkDebugReportObjectTypeLUNARG objType, uint64_t srcObject, size_t location, int32_t msgCode, @@ -157,7 +157,7 @@ VKAPI_ATTR void VKAPI_CALL vkDbgStringCallback( VKAPI_ATTR void VKAPI_CALL vkDbgStdioCallback( VkFlags msgFlags, - VkDbgObjectType objType, + VkDebugReportObjectTypeLUNARG objType, uint64_t srcObject, size_t location, int32_t msgCode, @@ -167,7 +167,7 @@ VKAPI_ATTR void VKAPI_CALL vkDbgStdioCallback( VKAPI_ATTR void VKAPI_CALL vkDbgBreakCallback( VkFlags msgFlags, - VkDbgObjectType objType, + VkDebugReportObjectTypeLUNARG objType, uint64_t srcObject, size_t location, int32_t msgCode, |