layers: Fix windows build for multi layer .def file
diff --git a/vk-generate.py b/vk-generate.py
index dc627fa..9491ec1 100755
--- a/vk-generate.py
+++ b/vk-generate.py
@@ -246,19 +246,22 @@
library_exports = {
"all": [],
"icd": [
- "EnumeratePhysicalDevices",
- "CreateInstance",
- "DestroyInstance",
- "GetDeviceProcAddr",
- "GetInstanceProcAddr",
+ "vkEnumeratePhysicalDevices",
+ "vkCreateInstance",
+ "vkDestroyInstance",
+ "vkGetDeviceProcAddr",
+ "vkGetInstanceProcAddr",
],
"layer": [
- "GetInstanceProcAddr",
- "GetDeviceProcAddr",
- "EnumerateLayers",
- "GetGlobalLayerProperties",
- "GetGlobalExtensionProperties"
+ "vkGetInstanceProcAddr",
+ "vkGetDeviceProcAddr",
+ "vkGetGlobalLayerProperties",
+ "vkGetGlobalExtensionProperties"
],
+ "layerMulti": [
+ "multi2GetInstanceProcAddr",
+ "multi1GetDeviceProcAddr"
+ ]
}
if len(self.argv) != 2 or self.argv[1] not in library_exports:
@@ -267,7 +270,10 @@
return
self.library = self.argv[0]
- self.exports = library_exports[self.argv[1]]
+ if self.library == "VKLayerMulti":
+ self.exports = library_exports["layerMulti"]
+ else:
+ self.exports = library_exports[self.argv[1]]
super().run()
@@ -307,10 +313,8 @@
body.append("LIBRARY " + self.library)
body.append("EXPORTS")
- for proto in self.protos:
- if self.exports and proto.name not in self.exports:
- continue
- body.append(" vk" + proto.name)
+ for proto in self.exports:
+ body.append( proto)
return "\n".join(body)