misc: Changes to fix warnings in Windows / VC++ build

10 files changed, 22 insertions, 32 deletions

diff --git a/demos/cube.c b/demos/cube.c
index 6429000d..3aa2128d 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -696,7 +696,8 @@ bool loadTexture(const char *filename, uint8_t *rgba_data,
 {
   //header for testing if it is a png
   png_byte header[8];
-  int is_png, bit_depth, color_type,rowbytes, retval;
+  int is_png, bit_depth, color_type, rowbytes;
+  size_t retval;
   png_uint_32 i, twidth, theight;
   png_structp  png_ptr;
   png_infop info_ptr, end_info;
@@ -1237,7 +1238,7 @@ static VkShader demo_prepare_shader(struct demo *demo,
     err = vkCreateShader(demo->device, &createInfo, &shader);
     if (err) {
         free((void *) createInfo.pCode);
-        return NULL;
+        return (VkShader) VK_NULL_HANDLE;
     }
 #endif
 
@@ -1247,7 +1248,7 @@ static VkShader demo_prepare_shader(struct demo *demo,
 char *demo_read_spv(const char *filename, size_t *psize)
 {
     long int size;
-    int U_ASSERT_ONLY retval;
+    size_t U_ASSERT_ONLY retval;
     void *shader_code;
 
     FILE *fp = fopen(filename, "rb");
@@ -1621,8 +1622,6 @@ LRESULT CALLBACK WndProc(HWND hWnd,
                          WPARAM wParam,
                          LPARAM lParam)
 {
-    PAINTSTRUCT paint_struct;
-    HDC hDC; // Device context
     char tmp_str[] = "Test Vulkan Cube Program"; 
 
     switch(uMsg)
@@ -2059,7 +2058,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     /* main message loop*/
     while(!done)
     {
-        PeekMessage(&msg,NULL,NULL,NULL,PM_REMOVE);
+        PeekMessage(&msg,0,0,0,PM_REMOVE);
         if (msg.message == WM_QUIT) //check for a quit message
         {
             done = true; //if found, quit app
@@ -2074,7 +2073,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 
     demo_cleanup(&demo);
 
-    return msg.wParam;
+    return (int) msg.wParam;
 }
 #else  // _WIN32
 int main(int argc, char **argv)
diff --git a/demos/tri.c b/demos/tri.c
index cf94425f..0504dbec 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -1172,8 +1172,6 @@ LRESULT CALLBACK WndProc(HWND hWnd,
                          WPARAM wParam,
                          LPARAM lParam)
 {
-    PAINTSTRUCT paint_struct;
-    HDC hDC; // Device context
     char tmp_str[] = "Test Vulkan Triangle Program"; 
 
     switch(uMsg)
@@ -1571,7 +1569,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     /* main message loop*/
     while(!done)
     {
-        PeekMessage(&msg,NULL,NULL,NULL,PM_REMOVE);
+        PeekMessage(&msg,0,0,0,PM_REMOVE);
         if (msg.message == WM_QUIT) //check for a quit message
         {
             done = true; //if found, quit app
@@ -1586,7 +1584,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 
     demo_cleanup(&demo);
 
-    return msg.wParam;
+    return (int) msg.wParam;
 }
 #else  // _WIN32
 int main(const int argc, const char *argv[])
diff --git a/layers/basic.cpp b/layers/basic.cpp
index 64964f34..260f7c3d 100644
--- a/layers/basic.cpp
+++ b/layers/basic.cpp
@@ -78,8 +78,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionInfo(
                                                size_t*  pDataSize,
                                                void*    pData)
 {
-    VkResult result;
-
     /* This entrypoint is NOT going to init it's own dispatch table since loader calls here early */
     VkExtensionProperties *ext_props;
     uint32_t *count;
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 2f5e5614..af1c4787 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -30,9 +30,13 @@
 #include "loader_platform.h"
 #include "vk_dispatch_table_helper.h"
 #include "vk_struct_string_helper_cpp.h"
+#if defined(__GNUC__)
 #pragma GCC diagnostic ignored "-Wwrite-strings"
+#endif
 #include "vk_struct_graphviz_helper.h"
+#if defined(__GNUC__)
 #pragma GCC diagnostic warning "-Wwrite-strings"
+#endif
 #include "vk_struct_size_helper.h"
 #include "draw_state.h"
 #include "layers_config.h"
@@ -1484,8 +1488,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionInfo(
                                                size_t*  pDataSize,
                                                void*    pData)
 {
-    VkResult result;
-
     /* This entrypoint is NOT going to init it's own dispatch table since loader calls here early */
     VkExtensionProperties *ext_props;
     uint32_t *count;
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 45bea6f5..0da8996c 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -500,12 +500,12 @@ static bool32_t deleteCBInfoList()
 // For given MemObjInfo, report Obj & CB bindings
 static void reportMemReferencesAndCleanUp(MT_MEM_OBJ_INFO* pMemObjInfo)
 {
-    uint32_t cmdBufRefCount = pMemObjInfo->pCmdBufferBindings.size();
-    uint32_t objRefCount    = pMemObjInfo->pObjBindings.size();
+    size_t cmdBufRefCount = pMemObjInfo->pCmdBufferBindings.size();
+    size_t objRefCount    = pMemObjInfo->pObjBindings.size();
 
     if ((pMemObjInfo->pCmdBufferBindings.size() + pMemObjInfo->pObjBindings.size()) != 0) {
         char str[1024];
-        sprintf(str, "Attempting to free memory object %p which still contains %d references", pMemObjInfo->mem, (cmdBufRefCount + objRefCount));
+        sprintf(str, "Attempting to free memory object %p which still contains %lu references", pMemObjInfo->mem, (cmdBufRefCount + objRefCount));
         layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, pMemObjInfo->mem, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str);
     }
 
@@ -915,8 +915,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionInfo(
                                                size_t*  pDataSize,
                                                void*    pData)
 {
-    VkResult result;
-
     /* This entrypoint is NOT going to init it's own dispatch table since loader calls here early */
     VkExtensionProperties *ext_props;
     uint32_t *count;
@@ -995,7 +993,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkQueueAddMemReferences(VkQueue queue, uint32_t c
             sprintf(str, "Unknown Queue %p", queue);
             layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, queue, 0, MEMTRACK_INVALID_QUEUE, "MEM", str);
         } else {
-            for (int i = 0; i < count; i++) {
+            for (uint32_t i = 0; i < count; i++) {
                 if (checkMemRef(queue, pMems[i]) == VK_TRUE) {
                     // Alread in list, just warn
                     char str[1024];
@@ -1025,7 +1023,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkQueueRemoveMemReferences(VkQueue queue, uint32_
             sprintf(str, "Unknown Queue %p", queue);
             layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, queue, 0, MEMTRACK_INVALID_QUEUE, "MEM", str);
         } else {
-            for (int i = 0; i < count; i++) {
+            for (uint32_t i = 0; i < count; i++) {
                 for (list<VkDeviceMemory>::iterator it = pQueueInfo->pMemRefList.begin(); it != pQueueInfo->pMemRefList.end(); ++it) {
                     if ((*it) == pMems[i]) {
                         it = pQueueInfo->pMemRefList.erase(it);
diff --git a/layers/multi.cpp b/layers/multi.cpp
index 1640dc6f..b26e67db 100644
--- a/layers/multi.cpp
+++ b/layers/multi.cpp
@@ -267,8 +267,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionInfo(
                                                size_t*  pDataSize,
                                                void*    pData)
 {
-    VkResult result;
-
     /* This entrypoint is NOT going to init it's own dispatch table since loader calls here early */
     VkExtensionProperties *ext_props;
     uint32_t *count;
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 3171baf2..73a505f1 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -261,8 +261,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionInfo(
                                                size_t*  pDataSize,
                                                void*    pData)
 {
-    VkResult result;
-
     /* This entrypoint is NOT going to init it's own dispatch table since loader calls here early */
     VkExtensionProperties *ext_props;
     uint32_t *count;
diff --git a/loader/loader.c b/loader/loader.c
index 7c7597e8..2a0ff72d 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -127,7 +127,7 @@ char *loader_get_registry_string(const HKEY hive,
     HKEY key;
     LONG  rtn_value;
     char *rtn_str = NULL;
-    size_t rtn_len = 0;
+    DWORD rtn_len = 0;
     size_t allocated_len = 0;
 
     rtn_value = RegOpenKeyEx(hive, sub_key, 0, access_flags, &key);
@@ -177,7 +177,7 @@ static char *loader_get_registry_and_env(const char *env_var,
     char *env_str = getenv(env_var);
     size_t env_len = (env_str == NULL) ? 0 : strlen(env_str);
     char *registry_str = NULL;
-    DWORD registry_len = 0;
+    size_t registry_len = 0;
     char *rtn_str = NULL;
     size_t rtn_len;
 
@@ -363,7 +363,7 @@ static bool loader_is_extension_scanned(const char *name)
     return false;
 }
 
-static void loader_coalesce_extensions()
+static void loader_coalesce_extensions(void)
 {
     uint32_t i;
     struct loader_scanned_icds *icd_list = loader.scanned_icd_list;
diff --git a/vk-generate.py b/vk-generate.py
index 550ebc1d..75ced769 100755
--- a/vk-generate.py
+++ b/vk-generate.py
@@ -140,7 +140,7 @@ class LoaderEntrypointsSubcommand(Subcommand):
             cond = ("%s == VK_PHYSICAL_DEVICE_INFO_TYPE_DISPLAY_PROPERTIES_WSI && "
                     "%s && %s" % (ptype, pdata, cond))
             setup.append("VkDisplayPropertiesWSI *info = %s;" % pdata)
-            setup.append("uint32_t count = *%s / sizeof(*info), i;" % psize)
+            setup.append("size_t count = *%s / sizeof(*info), i;" % psize)
             setup.append("for (i = 0; i < count; i++) {")
             setup.append("    %s(info[i].display, disp);" % method)
             setup.append("}")
@@ -151,7 +151,7 @@ class LoaderEntrypointsSubcommand(Subcommand):
             cond = ("%s == VK_SWAP_CHAIN_INFO_TYPE_PERSISTENT_IMAGES_WSI && "
                     "%s && %s" % (ptype, pdata, cond))
             setup.append("VkSwapChainImageInfoWSI *info = %s;" % pdata)
-            setup.append("uint32_t count = *%s / sizeof(*info), i;" % psize)
+            setup.append("size_t count = *%s / sizeof(*info), i;" % psize)
             setup.append("for (i = 0; i < count; i++) {")
             setup.append("    %s(info[i].image, disp);" % method)
             setup.append("    %s(info[i].memory, disp);" % method)
diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index e97243b1..5a19ddfa 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -1341,7 +1341,6 @@ class ThreadingSubcommand(Subcommand):
         if proto.name == "EnumerateLayers":
             funcs.append('%s%s\n'
                      '{\n'
-                     '    char str[1024];\n'
                      '    if (gpu != NULL) {\n'
                      '        pCurObj = (VkBaseLayerObject *) %s;\n'
                      '        loader_platform_thread_once(&tabOnce, init%s);\n'