From 0f060df145d1a612dfa4c07c16d3aeada75d46f3 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Wed, 9 Dec 2015 15:48:16 -0700 Subject: debug_report: rename object type and error bits Conflicts: demos/tri.c layers/device_limits.cpp layers/draw_state.cpp layers/image.cpp layers/mem_tracker.cpp layers/param_checker.cpp layers/vk_layer_logging.h loader/debug_report.c tests/layer_validation_tests.cpp --- loader/debug_report.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'loader/debug_report.h') diff --git a/loader/debug_report.h b/loader/debug_report.h index baaae86f..a314fb16 100644 --- a/loader/debug_report.h +++ b/loader/debug_report.h @@ -28,7 +28,7 @@ #include "vk_loader_platform.h" #include "loader.h" -#include "vulkan/vk_lunarg_debug_report.h" +#include "vulkan/vk_ext_debug_report.h" /* * CreateMsgCallback is global and needs to be * applied to all layers and ICDs. @@ -104,20 +104,20 @@ bool debug_report_instance_gpa( void **addr); VKAPI_ATTR VkResult VKAPI_CALL loader_CreateDebugReportCallback( - VkInstance instance, - VkDebugReportCallbackCreateInfoLUNARG *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkDebugReportCallbackLUNARG *pCallback); + VkInstance instance, + const VkDebugReportCallbackCreateInfoEXT *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkDebugReportCallbackEXT *pCallback); VKAPI_ATTR void VKAPI_CALL loader_DestroyDebugReportCallback( VkInstance instance, - VkDebugReportCallbackLUNARG callback, + VkDebugReportCallbackEXT callback, const VkAllocationCallbacks *pAllocator); VKAPI_ATTR void VKAPI_CALL loader_DebugReportMessage( VkInstance instance, - VkDebugReportFlagsLUNARG flags, - VkDebugReportObjectTypeLUNARG objType, + VkDebugReportFlagsEXT flags, + VkDebugReportObjectTypeEXT objType, uint64_t object, size_t location, int32_t msgCode, @@ -126,19 +126,19 @@ VKAPI_ATTR void VKAPI_CALL loader_DebugReportMessage( VkResult util_CreateDebugReportCallback( struct loader_instance *inst, - VkDebugReportCallbackCreateInfoLUNARG *pCreateInfo, + VkDebugReportCallbackCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, - VkDebugReportCallbackLUNARG callback); + VkDebugReportCallbackEXT callback); void util_DestroyDebugReportCallback( struct loader_instance *inst, - VkDebugReportCallbackLUNARG callback, + VkDebugReportCallbackEXT callback, const VkAllocationCallbacks *pAllocator); VkBool32 util_DebugReportMessage( const struct loader_instance* inst, VkFlags msgFlags, - VkDebugReportObjectTypeLUNARG objectType, + VkDebugReportObjectTypeEXT objectType, uint64_t srcObject, size_t location, int32_t msgCode, -- cgit v1.2.3