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

tests/vkrenderframework.h

diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index 641c971..8ae3585 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -34,7 +34,7 @@
 #else
 #include "vktestframework.h"
 #endif
-#include "vulkan/vk_lunarg_debug_report.h"
+#include "vulkan/vk_ext_debug_report.h"
 #include "vulkan/vk_lunarg_debug_marker.h"
 
 #include <vector>
@@ -99,7 +99,7 @@
             std::vector<const char *> device_layer_names,
             std::vector<const char *> instance_extension_names,
             std::vector<const char *> device_extension_names,
-            PFN_vkDebugReportCallbackLUNARG=NULL,
+            PFN_vkDebugReportCallbackEXT=NULL,
             void *userData=NULL);
 
     void ShutdownFramework();
@@ -140,11 +140,11 @@
     float                               m_depth_clear_color;
     uint32_t                            m_stencil_clear_color;
     VkDepthStencilObj                  *m_depthStencil;
-    PFN_vkCreateDebugReportCallbackLUNARG          m_CreateDebugReportCallback;
-    PFN_vkDestroyDebugReportCallbackLUNARG         m_DestroyDebugReportCallback;
-    PFN_vkDebugReportMessageLUNARG                 m_DebugReportMessage;
-    VkDebugReportCallbackLUNARG                    m_globalMsgCallback;
-    VkDebugReportCallbackLUNARG                    m_devMsgCallback;
+    PFN_vkCreateDebugReportCallbackEXT          m_CreateDebugReportCallback;
+    PFN_vkDestroyDebugReportCallbackEXT         m_DestroyDebugReportCallback;
+    PFN_vkDebugReportMessageEXT                 m_DebugReportMessage;
+    VkDebugReportCallbackEXT                    m_globalMsgCallback;
+    VkDebugReportCallbackEXT                    m_devMsgCallback;
 
     /*
      * SetUp and TearDown are called by the Google Test framework