diff options
| author | Courtney Goeltzenleuchter <courtneygo@google.com> | 2015-12-09 15:48:16 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-12-17 11:26:03 -0700 |
| commit | 0f060df145d1a612dfa4c07c16d3aeada75d46f3 (patch) | |
| tree | d795d9a412dfcdcf92e7184385b9a10d6c8dd068 /loader/loader.h | |
| parent | b1c118f19f066052cc5e53ed6770777e01dd1aab (diff) | |
| download | usermoji-0f060df145d1a612dfa4c07c16d3aeada75d46f3.tar.xz | |
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
Diffstat (limited to 'loader/loader.h')
| -rw-r--r-- | loader/loader.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/loader/loader.h b/loader/loader.h index 057d12d1..69b6c4d5 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -36,7 +36,7 @@ #include <vulkan/vulkan.h> #include <vk_loader_platform.h> -#include <vulkan/vk_lunarg_debug_report.h> +#include <vulkan/vk_ext_debug_report.h> #include <vulkan/vk_layer.h> #include <vulkan/vk_icd.h> @@ -189,9 +189,9 @@ struct loader_icd { PFN_vkGetPhysicalDeviceMemoryProperties GetPhysicalDeviceMemoryProperties; PFN_vkEnumerateDeviceExtensionProperties EnumerateDeviceExtensionProperties; PFN_vkGetPhysicalDeviceSparseImageFormatProperties GetPhysicalDeviceSparseImageFormatProperties; - PFN_vkCreateDebugReportCallbackLUNARG CreateDebugReportCallbackLUNARG; - PFN_vkDestroyDebugReportCallbackLUNARG DestroyDebugReportCallbackLUNARG; - PFN_vkDebugReportMessageLUNARG DebugReportMessageLUNARG; + PFN_vkCreateDebugReportCallbackEXT CreateDebugReportCallbackEXT; + PFN_vkDestroyDebugReportCallbackEXT DestroyDebugReportCallbackEXT; + PFN_vkDebugReportMessageEXT DebugReportMessageEXT; PFN_vkGetPhysicalDeviceSurfaceSupportKHR GetPhysicalDeviceSurfaceSupportKHR; PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR GetPhysicalDeviceSurfaceCapabilitiesKHR; PFN_vkGetPhysicalDeviceSurfaceFormatsKHR GetPhysicalDeviceSurfaceFormatsKHR; @@ -343,8 +343,8 @@ extern loader_platform_thread_mutex loader_json_lock; extern const VkLayerInstanceDispatchTable instance_disp; struct loader_msg_callback_map_entry { - VkDebugReportCallbackLUNARG icd_obj; - VkDebugReportCallbackLUNARG loader_obj; + VkDebugReportCallbackEXT icd_obj; + VkDebugReportCallbackEXT loader_obj; }; bool compare_vk_extension_properties( |