commit b69cd59bb63ce00c8efa7a110481431924c3a740
author Courtney Goeltzenleuchter <courtneygo@google.com> Tue Jan 19 16:08:39 2016 -0700
committer Jon Ashburn <jon@lunarg.com> Wed Jan 20 18:07:12 2016 -0700
tree 55b6d1aeb359744ae24f0212d9a15f455e9d96d1
parent 0f1a5332a11c24392f195b8b4c6dcadfb338e395

debug_report: Integrate review feedback

Conflicts:
	include/vulkan/vk_ext_debug_report.h

Conflicts:
	include/vulkan/vk_ext_debug_report.h

layers/device_limits.cpp

diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp
index 24df64e..8648f5c 100644
--- a/layers/device_limits.cpp
+++ b/layers/device_limits.cpp
@@ -152,7 +152,7 @@
 static const VkExtensionProperties instance_extensions[] = {
     {
         VK_EXT_DEBUG_REPORT_EXTENSION_NAME,
-        VK_EXT_DEBUG_REPORT_REVISION
+        VK_EXT_DEBUG_REPORT_SPEC_VERSION
     }
 };
 

layers/draw_state.cpp

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 8d6ac65..41cf1b4 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2964,7 +2964,7 @@
 static const VkExtensionProperties instance_extensions[] = {
     {
         VK_EXT_DEBUG_REPORT_EXTENSION_NAME,
-        VK_EXT_DEBUG_REPORT_REVISION
+        VK_EXT_DEBUG_REPORT_SPEC_VERSION
     }
 };
 

layers/image.cpp

diff --git a/layers/image.cpp b/layers/image.cpp
index f371bdc..a821712 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -245,7 +245,7 @@
 static const VkExtensionProperties instance_extensions[] = {
     {
         VK_EXT_DEBUG_REPORT_EXTENSION_NAME,
-        VK_EXT_DEBUG_REPORT_REVISION
+        VK_EXT_DEBUG_REPORT_SPEC_VERSION
     }
 };
 

layers/mem_tracker.cpp

diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index afcc7cd..a29a6a4 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1266,7 +1266,7 @@
 static const VkExtensionProperties instance_extensions[] = {
     {
         VK_EXT_DEBUG_REPORT_EXTENSION_NAME,
-        VK_EXT_DEBUG_REPORT_REVISION
+        VK_EXT_DEBUG_REPORT_SPEC_VERSION
     }
 };
 

layers/param_checker.cpp

diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index f63562d..1a5affe 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -167,7 +167,7 @@
 static const VkExtensionProperties instance_extensions[] = {
     {
         VK_EXT_DEBUG_REPORT_EXTENSION_NAME,
-        VK_EXT_DEBUG_REPORT_REVISION
+        VK_EXT_DEBUG_REPORT_SPEC_VERSION
     }
 };
 

layers/swapchain.cpp

diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp
index 051d14f..2f02f95 100644
--- a/layers/swapchain.cpp
+++ b/layers/swapchain.cpp
@@ -45,7 +45,7 @@
 static const VkExtensionProperties instance_extensions[] = {
     {
         VK_EXT_DEBUG_REPORT_EXTENSION_NAME,
-        VK_EXT_DEBUG_REPORT_REVISION
+        VK_EXT_DEBUG_REPORT_SPEC_VERSION
     }
 };
 

layers/vk_layer_logging.h

diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h
index 06a27a3..e199472 100644
--- a/layers/vk_layer_logging.h
+++ b/layers/vk_layer_logging.h
@@ -122,7 +122,7 @@
         debug_report_log_msg(
                     debug_data, VK_DEBUG_REPORT_WARN_BIT_EXT,
                     VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT, (uint64_t) pTrav->msgCallback,
-                    0, VK_DEBUG_REPORT_ERROR_CALLBACK_REF,
+                    0, VK_DEBUG_REPORT_ERROR_CALLBACK_REF_EXT,
                     "DebugReport",
                     "Debug Report callbacks not removed before DestroyInstance");
 
@@ -174,7 +174,7 @@
     debug_report_log_msg(
                 debug_data, VK_DEBUG_REPORT_DEBUG_BIT_EXT,
                 VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT, (uint64_t) *pCallback,
-                0, VK_DEBUG_REPORT_ERROR_CALLBACK_REF,
+                0, VK_DEBUG_REPORT_ERROR_CALLBACK_REF_EXT,
                 "DebugReport",
                 "Added callback");
     return VK_SUCCESS;
@@ -200,7 +200,7 @@
             debug_report_log_msg(
                         debug_data, VK_DEBUG_REPORT_DEBUG_BIT_EXT,
                         VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT, (uint64_t) pTrav->msgCallback,
-                        0, VK_DEBUG_REPORT_ERROR_CALLBACK_REF,
+                        0, VK_DEBUG_REPORT_ERROR_CALLBACK_REF_EXT,
                         "DebugReport",
                         "Destroyed callback");
         } else {