commit 18f7155b170361efe3145968cba743cd73472e27
author Tony Barbour <tony@LunarG.com> Wed Apr 22 11:36:22 2015 -0600
committer Tony Barbour <tony@LunarG.com> Wed Apr 22 12:47:54 2015 -0600
tree 1de4695b6394e1f0546fda349a66db8416b407b5
parent f20f87b5aac0c08eb1ce71d2e1930d5f783c9e55

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

layers/mem_tracker.cpp

diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 45bea6f..0da8996 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -500,12 +500,12 @@
 // 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 @@
                                                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 @@
             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 @@
             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);