From 0f060df145d1a612dfa4c07c16d3aeada75d46f3 Mon Sep 17 00:00:00 2001
From: Courtney Goeltzenleuchter <courtneygo@google.com>
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/loader.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'loader/loader.h')

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(
-- 
cgit v1.2.3