diff options
| author | Ian Elliott <ian@LunarG.com> | 2015-04-15 12:53:19 -0600 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-04-16 17:48:20 +0800 |
| commit | bc79d9dc372ebd538f3aff7a1737b65bb20582c9 (patch) | |
| tree | fd15633c7de8c120761d149eab3acc03a7a29263 | |
| parent | 7162bae8092129d980b594d4a3e5fe3e2f9fe652 (diff) | |
| download | usermoji-bc79d9dc372ebd538f3aff7a1737b65bb20582c9.tar.xz | |
Win: Some compilation/link fixes.
| -rw-r--r-- | loader/loader.c | 3 | ||||
| -rwxr-xr-x | vk-generate.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/loader/loader.c b/loader/loader.c index cf38b714..20646a7b 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1278,8 +1278,9 @@ LOADER_EXPORT void * VKAPI vkGetProcAddr(VkPhysicalGpu gpu, const char * pName) /* for entrypoints that loader must handle (ie non-dispatchable or create object) make sure the loader entrypoint is returned */ addr = loader_non_passthrough_gpa(pName); - if (addr) + if (addr) { return addr; + } /* return the dispatch table entrypoint for the fastest case */ const VkLayerDispatchTable *disp_table = * (VkLayerDispatchTable **) gpu; diff --git a/vk-generate.py b/vk-generate.py index f6aa0df3..92bac911 100755 --- a/vk-generate.py +++ b/vk-generate.py @@ -223,7 +223,7 @@ class DispatchTableOpsSubcommand(Subcommand): if proto.name == "GetProcAddr": stmts.append("table->%s = gpa; /* direct assignment */" % proto.name) - elif self.is_dispatchable_object_first_param(proto): + elif self.is_dispatchable_object_first_param(proto) or proto.name == "CreateInstance": stmts.append("table->%s = (PFN_vk%s) gpa(gpu, \"vk%s\");" % (proto.name, proto.name, proto.name)) else: |