diff options
| author | Tobin Ehlis <tobine@google.com> | 2017-10-27 12:40:32 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2017-10-30 11:01:05 -0600 |
| commit | ba367602f9c058f32a98b84f016cb9209bbd6e86 (patch) | |
| tree | 8d12c8b507ac9e530beccdb41efa303b6e8ef12c /scripts | |
| parent | ffde46d783b3b983f5c6610f876617a24cf989f8 (diff) | |
| download | usermoji-ba367602f9c058f32a98b84f016cb9209bbd6e86.tar.xz | |
icd:Fixes for Windows build
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mock_icd_generator.py | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py index 6dbcab0c..54e2b34f 100644 --- a/scripts/mock_icd_generator.py +++ b/scripts/mock_icd_generator.py @@ -202,11 +202,8 @@ static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL GetPhysicalDeviceProcAddr(VkInst #define EXPORT #endif -#ifdef WIN32 - extern "C" __declspec(dllexport) { -#else - extern "C" { -#endif +extern "C" { + EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr(VkInstance instance, const char* pName) { if (!vkmock::negotiate_loader_icd_interface_called) { vkmock::loader_interface_version = 1; @@ -412,11 +409,9 @@ EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateMacOSSurfaceMVK( return vkmock::CreateMacOSSurfaceMVK(instance, pCreateInfo, pAllocator, pSurface); } #endif /* VK_USE_PLATFORM_MACOS_MVK */ -#ifdef WIN32 - } // end extern "C" -#else - } // end extern "C" -#endif + +} // end extern "C" + ''' CUSTOM_C_INTERCEPTS = { @@ -488,7 +483,7 @@ CUSTOM_C_INTERCEPTS = { // If requesting number of extensions, return that if (!pLayerName) { if (!pProperties) { - *pPropertyCount = instance_extension_map.size(); + *pPropertyCount = (uint32_t)instance_extension_map.size(); } else { uint32_t i = 0; for (const auto &name_ver_pair : instance_extension_map) { @@ -512,7 +507,7 @@ CUSTOM_C_INTERCEPTS = { // If requesting number of extensions, return that if (!pLayerName) { if (!pProperties) { - *pPropertyCount = device_extension_map.size(); + *pPropertyCount = (uint32_t)device_extension_map.size(); } else { uint32_t i = 0; for (const auto &name_ver_pair : device_extension_map) { @@ -649,7 +644,7 @@ CUSTOM_C_INTERCEPTS = { // TODO: Just hard-coding 4k whole size for now if (VK_WHOLE_SIZE == size) size = 4096; - void* map_addr = malloc(size); + void* map_addr = malloc((size_t)size); mapped_memory_map[memory].push_back(map_addr); *ppData = map_addr; return VK_SUCCESS; |