loader: Fix bug on layer name prefix string length

Also add GetGlobalExtensionInfo to layer .def file

diff --git a/loader/loader.c b/loader/loader.c
index 2a0ff72dd3652dd6bcd40ba0b829e27fbc0866be..64f6bb0f77a00c7b528dfe00d360575ad09f07fc 100644 (file)
--- 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 08ce20838537c5a138d333c17ea366a03e2e939e..60460bfb63ea71b4e108e9dd17eb0b07169094d7 100644 (file)
--- 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 0facafed991600637341ca026bc7ac2a5dbaf4b2..a2da47a1e0b27ce6e9db3ed3546633f85d0f559c 100755 (executable)
--- a/vk-generate.py
+++ b/vk-generate.py
@@ -407,6 +407,7 @@ class WinDefFileSubcommand(Subcommand):
                 "layer": [
                     "GetProcAddr",
                     "EnumerateLayers",
+                    "GetGlobalExtensionInfo",
                 ],
         }