xchange-93: Use VK_ prefix on DEBUG_REPORT_..._NAME

Use the Vulkan namespace (VK_ prefix) on DEBUG_REPORT_EXTENSION_NAME
This resolves LunarXchange bug #93.
https://vulkan.lunarg.com/app/issues/55b76ae37ef24d0001000070

6 files changed, 9 insertions, 9 deletions

diff --git a/demos/cube.c b/demos/cube.c
index ba155aeb..6b41aff4 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -2213,9 +2213,9 @@ static void demo_init_vk(struct demo *demo)
             WSIextFound = 1;
             extension_names[enabled_extension_count++] = "VK_WSI_swapchain";
         }
-        if (!strcmp(DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extName)) {
+        if (!strcmp(VK_DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extName)) {
             if (demo->validate) {
-                extension_names[enabled_extension_count++] = DEBUG_REPORT_EXTENSION_NAME;
+                extension_names[enabled_extension_count++] = VK_DEBUG_REPORT_EXTENSION_NAME;
             }
         }
         assert(enabled_extension_count < 64);
diff --git a/demos/tri.c b/demos/tri.c
index 7580c997..7b3dfb60 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -1709,9 +1709,9 @@ static void demo_init_vk(struct demo *demo)
             WSIextFound = 1;
             extension_names[enabled_extension_count++] = "VK_WSI_swapchain";
         }
-        if (!strcmp(DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extName)) {
+        if (!strcmp(VK_DEBUG_REPORT_EXTENSION_NAME, instance_extensions[i].extName)) {
             if (demo->validate) {
-                extension_names[enabled_extension_count++] = DEBUG_REPORT_EXTENSION_NAME;
+                extension_names[enabled_extension_count++] = VK_DEBUG_REPORT_EXTENSION_NAME;
             }
         }
         assert(enabled_extension_count < 64);
diff --git a/include/vk_debug_report_lunarg.h b/include/vk_debug_report_lunarg.h
index af4dc843..633b50da 100644
--- a/include/vk_debug_report_lunarg.h
+++ b/include/vk_debug_report_lunarg.h
@@ -157,7 +157,7 @@ static inline const char* string_VkDbgObjectType(VkDbgObjectType input_value)
             return "Unhandled VkObjectType";
     }
 }
-#define DEBUG_REPORT_EXTENSION_NAME "DEBUG_REPORT"
+#define VK_DEBUG_REPORT_EXTENSION_NAME "DEBUG_REPORT"
 
 VK_DEFINE_NONDISP_HANDLE(VkDbgMsgCallback)
 
diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h
index f2952e98..b81a5e5f 100644
--- a/layers/vk_layer_logging.h
+++ b/layers/vk_layer_logging.h
@@ -91,7 +91,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], DEBUG_REPORT_EXTENSION_NAME) == 0) {
+        if (strcmp(ppEnabledExtensions[i], VK_DEBUG_REPORT_EXTENSION_NAME) == 0) {
             debug_data->g_DEBUG_REPORT = true;
         }
     }
diff --git a/layers/vk_layer_msg.h b/layers/vk_layer_msg.h
index 3b08a2c4..9eb2fc85 100644
--- a/layers/vk_layer_msg.h
+++ b/layers/vk_layer_msg.h
@@ -38,7 +38,7 @@ static void enable_debug_report(
 {
     for (uint32_t i = 0; i < extension_count; i++) {
         /* TODO: Check other property fields */
-        if (strcmp(ppEnabledExtensionNames[i], DEBUG_REPORT_EXTENSION_NAME) == 0) {
+        if (strcmp(ppEnabledExtensionNames[i], VK_DEBUG_REPORT_EXTENSION_NAME) == 0) {
             g_DEBUG_REPORT = true;
         }
     }
diff --git a/loader/debug_report.c b/loader/debug_report.c
index 5ef5c491..4ee3a3c5 100644
--- a/loader/debug_report.c
+++ b/loader/debug_report.c
@@ -43,7 +43,7 @@ typedef void (VKAPI *PFN_stringCallback)(char *message);
 
 static const struct loader_extension_property debug_report_extension_info = {
     .info =  {
-        .extName = DEBUG_REPORT_EXTENSION_NAME,
+        .extName = VK_DEBUG_REPORT_EXTENSION_NAME,
         .specVersion = VK_DEBUG_REPORT_EXTENSION_VERSION,
         },
     .origin = VK_EXTENSION_ORIGIN_LOADER,
@@ -62,7 +62,7 @@ void debug_report_create_instance(
     ptr_instance->debug_report_enabled = false;
 
     for (uint32_t i = 0; i < pCreateInfo->extensionCount; i++) {
-        if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], DEBUG_REPORT_EXTENSION_NAME) == 0) {
+        if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_DEBUG_REPORT_EXTENSION_NAME) == 0) {
             ptr_instance->debug_report_enabled = true;
             return;
         }