From 566e9005d29036fdf660445ead9a39b2ac65f5e7 Mon Sep 17 00:00:00 2001
From: Jon Ashburn <jon@lunarg.com>
Date: Fri, 24 Apr 2015 14:10:50 -0700
Subject: loader: Fix bug on layer name prefix string length

Also add GetGlobalExtensionInfo to layer .def file
---
 loader/loader.c          | 4 ++++
 loader/loader_platform.h | 2 +-
 vk-generate.py           | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/loader/loader.c b/loader/loader.c
index 2a0ff72d..64f6bb0f 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -233,8 +233,12 @@ static void loader_log(VK_DBG_MSG_TYPE msg_type, int32_t msg_code,
     }
     va_end(ap);
 
+#if defined(WIN32)
+	OutputDebugString(msg);
+#else
     fputs(msg, stderr);
     fputc('\n', stderr);
+#endif
 }
 
 static bool has_extension(struct extension_property *exts, uint32_t count,
diff --git a/loader/loader_platform.h b/loader/loader_platform.h
index 08ce2083..60460bfb 100644
--- a/loader/loader_platform.h
+++ b/loader/loader_platform.h
@@ -162,7 +162,7 @@ using namespace std;
 #define VK_DRIVER_LIBRARY_PREFIX_LEN 3
 // TODO/TBD: Is this an appropriate suffix for Windows?
 #define VK_LAYER_LIBRARY_PREFIX "VKLayer"
-#define VK_LAYER_LIBRARY_PREFIX_LEN 8
+#define VK_LAYER_LIBRARY_PREFIX_LEN 7
 #define VK_LIBRARY_SUFFIX ".dll"
 #define VK_LIBRARY_SUFFIX_LEN 4
 #endif //  DEFAULT_VK_DRIVERS_PATH
diff --git a/vk-generate.py b/vk-generate.py
index 0facafed..a2da47a1 100755
--- a/vk-generate.py
+++ b/vk-generate.py
@@ -407,6 +407,7 @@ class WinDefFileSubcommand(Subcommand):
                 "layer": [
                     "GetProcAddr",
                     "EnumerateLayers",
+                    "GetGlobalExtensionInfo",
                 ],
         }
 
-- 
cgit v1.2.3