From 48d23cc83dbd8966443c191ea031d2889df84bc5 Mon Sep 17 00:00:00 2001
From: Courtney Goeltzenleuchter <courtneygo@google.com>
Date: Tue, 19 Jan 2016 16:08:39 -0700
Subject: 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  | 2 +-
 layers/draw_state.cpp     | 2 +-
 layers/image.cpp          | 2 +-
 layers/mem_tracker.cpp    | 2 +-
 layers/param_checker.cpp  | 2 +-
 layers/swapchain.cpp      | 2 +-
 layers/vk_layer_logging.h | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'layers')

diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp
index 24df64e1..8648f5c6 100644
--- a/layers/device_limits.cpp
+++ b/layers/device_limits.cpp
@@ -152,7 +152,7 @@ static void init_device_limits(layer_data *my_data, const VkAllocationCallbacks
 static const VkExtensionProperties instance_extensions[] = {
     {
         VK_EXT_DEBUG_REPORT_EXTENSION_NAME,
-        VK_EXT_DEBUG_REPORT_REVISION
+        VK_EXT_DEBUG_REPORT_SPEC_VERSION
     }
 };
 
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 8d6ac658..41cf1b45 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2964,7 +2964,7 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyDevice(VkDevice device, cons
 static const VkExtensionProperties instance_extensions[] = {
     {
         VK_EXT_DEBUG_REPORT_EXTENSION_NAME,
-        VK_EXT_DEBUG_REPORT_REVISION
+        VK_EXT_DEBUG_REPORT_SPEC_VERSION
     }
 };
 
diff --git a/layers/image.cpp b/layers/image.cpp
index f371bdc8..a821712b 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -245,7 +245,7 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyDevice(VkDevice device, cons
 static const VkExtensionProperties instance_extensions[] = {
     {
         VK_EXT_DEBUG_REPORT_EXTENSION_NAME,
-        VK_EXT_DEBUG_REPORT_REVISION
+        VK_EXT_DEBUG_REPORT_SPEC_VERSION
     }
 };
 
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index afcc7cd4..a29a6a4d 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1266,7 +1266,7 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceMemoryProperties(
 static const VkExtensionProperties instance_extensions[] = {
     {
         VK_EXT_DEBUG_REPORT_EXTENSION_NAME,
-        VK_EXT_DEBUG_REPORT_REVISION
+        VK_EXT_DEBUG_REPORT_SPEC_VERSION
     }
 };
 
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index f63562d4..1a5affe0 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -167,7 +167,7 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDebugReportMessageEXT(
 static const VkExtensionProperties instance_extensions[] = {
     {
         VK_EXT_DEBUG_REPORT_EXTENSION_NAME,
-        VK_EXT_DEBUG_REPORT_REVISION
+        VK_EXT_DEBUG_REPORT_SPEC_VERSION
     }
 };
 
diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp
index 051d14f4..2f02f952 100644
--- a/layers/swapchain.cpp
+++ b/layers/swapchain.cpp
@@ -45,7 +45,7 @@ template layer_data *get_my_data_ptr<layer_data>(
 static const VkExtensionProperties instance_extensions[] = {
     {
         VK_EXT_DEBUG_REPORT_EXTENSION_NAME,
-        VK_EXT_DEBUG_REPORT_REVISION
+        VK_EXT_DEBUG_REPORT_SPEC_VERSION
     }
 };
 
diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h
index 06a27a3b..e199472d 100644
--- a/layers/vk_layer_logging.h
+++ b/layers/vk_layer_logging.h
@@ -122,7 +122,7 @@ static inline void layer_debug_report_destroy_instance(debug_report_data *debug_
         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 @@ static inline VkResult layer_create_msg_callback(
     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 @@ static inline void layer_destroy_msg_callback(
             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 {
-- 
cgit v1.2.3