commit 6c05ded58c2c77fcbe3f9cd0cb6dfb1053f23734
author Tobin Ehlis <tobine@google.com> Fri Oct 27 12:40:32 2017 -0600
committer Tobin Ehlis <tobine@google.com> Mon Oct 30 11:01:05 2017 -0600
tree 422e0df0e98648682181a0c7d603fe744b788b74
parent bcaddfa0899c2df81e5e556de4ae5e63ceff5a05

icd:Fixes for Windows build

scripts/mock_icd_generator.py

diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py
index 6dbcab0..54e2b34 100644
--- a/scripts/mock_icd_generator.py
+++ b/scripts/mock_icd_generator.py
@@ -202,11 +202,8 @@
 #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 @@
     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 @@
     // 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 @@
     // 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 @@
     // 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;