From 9640364064be1e1f1db8ba4bed842fffcb1fae57 Mon Sep 17 00:00:00 2001
From: Courtney Goeltzenleuchter <courtneygo@google.com>
Date: Wed, 25 Nov 2015 13:40:37 -0700
Subject: layers: Rename VK_DEBUG_REPORT_EXTENSION enums

---
 demos/cube.c                            | 4 ++--
 demos/tri.c                             | 4 ++--
 include/vulkan/vk_lunarg_debug_report.h | 8 ++++----
 layers/vk_layer_logging.h               | 2 +-
 loader/debug_report.c                   | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/demos/cube.c b/demos/cube.c
index 4ebfdbc3..b85ef55d 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -2177,9 +2177,9 @@ static void demo_init_vk(struct demo *demo)
             extension_names[enabled_extension_count++] = VK_KHR_XCB_SURFACE_EXTENSION_NAME;
         }
 #endif // _WIN32
-        if (!strcmp(VK_DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extensionName)) {
+        if (!strcmp(VK_EXT_LUNARG_DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extensionName)) {
             if (demo->validate) {
-                extension_names[enabled_extension_count++] = VK_DEBUG_REPORT_EXTENSION_NAME;
+                extension_names[enabled_extension_count++] = VK_EXT_LUNARG_DEBUG_REPORT_EXTENSION_NAME;
             }
         }
         assert(enabled_extension_count < 64);
diff --git a/demos/tri.c b/demos/tri.c
index 066a6f63..8ad5c750 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -1786,9 +1786,9 @@ static void demo_init_vk(struct demo *demo)
             extension_names[enabled_extension_count++] = VK_KHR_XCB_SURFACE_EXTENSION_NAME;
         }
 #endif // _WIN32
-        if (!strcmp(VK_DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extensionName)) {
+        if (!strcmp(VK_EXT_LUNARG_DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extensionName)) {
             if (demo->validate) {
-                extension_names[enabled_extension_count++] = VK_DEBUG_REPORT_EXTENSION_NAME;
+                extension_names[enabled_extension_count++] = VK_EXT_LUNARG_DEBUG_REPORT_EXTENSION_NAME;
             }
         }
         assert(enabled_extension_count < 64);
diff --git a/include/vulkan/vk_lunarg_debug_report.h b/include/vulkan/vk_lunarg_debug_report.h
index 53ceae5a..ec301418 100644
--- a/include/vulkan/vk_lunarg_debug_report.h
+++ b/include/vulkan/vk_lunarg_debug_report.h
@@ -34,8 +34,8 @@
 
 #include "vulkan/vulkan.h"
 
-#define VK_DEBUG_REPORT_EXTENSION_NUMBER 5
-#define VK_DEBUG_REPORT_EXTENSION_REVISION 1
+#define VK_EXT_LUNARG_DEBUG_REPORT_EXTNSION_NUMBER 11
+#define VK_EXT_LUNARG_DEBUG_REPORT_EXTENSION_REVISION 1
 #ifdef __cplusplus
 extern "C"
 {
@@ -82,7 +82,7 @@ typedef enum {
     VK_OBJECT_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkDebugReportObjectTypeLUNARG;
 
-#define VK_DEBUG_REPORT_EXTENSION_NAME "DEBUG_REPORT"
+#define VK_EXT_LUNARG_DEBUG_REPORT_EXTENSION_NAME "VK_EXT_LUNARG_debug_report"
 
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDbgMsgCallback)
 
@@ -106,7 +106,7 @@ typedef enum _DEBUG_REPORT_ERROR
     DEBUG_REPORT_CALLBACK_REF,          // Callbacks were not destroyed prior to calling DestroyInstance
 } DEBUG_REPORT_ERROR;
 
-#define VK_DEBUG_REPORT_ENUM_EXTEND(type, id)    ((type)(VK_DEBUG_REPORT_EXTENSION_NUMBER * -1000 + (id)))
+#define VK_DEBUG_REPORT_ENUM_EXTEND(type, id)    ((type)(VK_EXT_LUNARG_DEBUG_REPORT_EXTNSION_NUMBER * -1000 + (id)))
 
 #define VK_OBJECT_TYPE_MSG_CALLBACK VK_DEBUG_REPORT_ENUM_EXTEND(VkDebugReportObjectTypeLUNARG, 0)
 #define VK_ERROR_VALIDATION_FAILED VK_DEBUG_REPORT_ENUM_EXTEND(VkResult, 0)
diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h
index 47c68772..5f9fe51e 100644
--- a/layers/vk_layer_logging.h
+++ b/layers/vk_layer_logging.h
@@ -97,7 +97,7 @@ static inline debug_report_data *debug_report_create_instance(
     memset(debug_data, 0, sizeof(debug_report_data));
     for (uint32_t i = 0; i < extension_count; i++) {
         /* TODO: Check other property fields */
-        if (strcmp(ppEnabledExtensions[i], VK_DEBUG_REPORT_EXTENSION_NAME) == 0) {
+        if (strcmp(ppEnabledExtensions[i], VK_EXT_LUNARG_DEBUG_REPORT_EXTENSION_NAME) == 0) {
             debug_data->g_DEBUG_REPORT = true;
         }
     }
diff --git a/loader/debug_report.c b/loader/debug_report.c
index af0fce1e..8fcdfe57 100644
--- a/loader/debug_report.c
+++ b/loader/debug_report.c
@@ -40,8 +40,8 @@
 typedef void (VKAPI_PTR *PFN_stringCallback)(char *message);
 
 static const VkExtensionProperties debug_report_extension_info = {
-        .extensionName = VK_DEBUG_REPORT_EXTENSION_NAME,
-        .specVersion = VK_DEBUG_REPORT_EXTENSION_REVISION,
+        .extensionName = VK_EXT_LUNARG_DEBUG_REPORT_EXTENSION_NAME,
+        .specVersion = VK_EXT_LUNARG_DEBUG_REPORT_EXTENSION_REVISION,
 };
 
 void debug_report_add_instance_extensions(
@@ -58,7 +58,7 @@ void debug_report_create_instance(
     ptr_instance->debug_report_enabled = false;
 
     for (uint32_t i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) {
-        if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_DEBUG_REPORT_EXTENSION_NAME) == 0) {
+        if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_LUNARG_DEBUG_REPORT_EXTENSION_NAME) == 0) {
             ptr_instance->debug_report_enabled = true;
             return;
         }
-- 
cgit v1.2.3