commit 7415d5a33d5269d539da31360f1e99e2b407765f
author Courtney Goeltzenleuchter <courtneygo@google.com> Wed Dec 09 15:48:16 2015 -0700
committer Jon Ashburn <jon@lunarg.com> Thu Dec 17 11:26:03 2015 -0700
tree bce7b2fea0bdf3793660781e7b08c81d00a8d980
parent 54ce81abee3ae8f9497ed84bda28bd49310ecc3a

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

diff --git a/loader/debug_report.h b/loader/debug_report.h
index baaae86..a314fb1 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 @@
         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 @@
 
 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,