layers: export debug_report extension

Need the EnumerateInstanceExtensionProperties to report
support for the debug report extension as well as in
the json file because different platforms will use either
the json file (Windows & Linux) or the Enumerate call (Android).

1 files changed, 13 insertions, 7 deletions

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index c2afbdc6..2cafc404 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2713,12 +2713,10 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyDevice(VkDevice device, cons
     layer_data_map.erase(key);
 }
 
-static const VkLayerProperties ds_global_layers[] = {
+static const VkExtensionProperties instance_extensions[] = {
     {
-        "DrawState",
-        VK_API_VERSION,
-        VK_MAKE_VERSION(0, 1, 0),
-        "Validation layer: DrawState",
+        VK_EXT_LUNARG_DEBUG_REPORT_EXTENSION_NAME,
+        VK_EXT_LUNARG_DEBUG_REPORT_EXTENSION_REVISION
     }
 };
 
@@ -2727,10 +2725,18 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceExtensionPrope
         uint32_t *pCount,
         VkExtensionProperties* pProperties)
 {
-    /* DrawState does not have any global extensions */
-    return util_GetExtensionProperties(0, NULL, pCount, pProperties);
+    return util_GetExtensionProperties(1, instance_extensions, pCount, pProperties);
 }
 
+static const VkLayerProperties ds_global_layers[] = {
+    {
+        "DrawState",
+        VK_API_VERSION,
+        VK_MAKE_VERSION(0, 1, 0),
+        "Validation layer: DrawState",
+    }
+};
+
 VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceLayerProperties(
         uint32_t *pCount,
         VkLayerProperties*    pProperties)