From 75594d24f740d36eb30648d7544da155ab85cc35 Mon Sep 17 00:00:00 2001 From: Tony Barbour Date: Fri, 10 Jul 2015 18:32:33 -0600 Subject: windows: clean up windows compile issues Conflicts: layers/object_track.h vk-layer-generate.py --- icd/nulldrv/nulldrv.c | 4 ++-- layers/mem_tracker.cpp | 1 + layers/object_track.h | 8 ++++---- vk-layer-generate.py | 25 ++++++++++++------------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index 867b3db7..1a90be05 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -464,7 +464,7 @@ static VkResult nulldrv_pipeline_layout_create(struct nulldrv_dev *dev, return VK_SUCCESS; } -static struct nulldrv_desc_layout *nulldrv_desc_layout(VkDescriptorSetLayout layout) +static struct nulldrv_desc_layout *nulldrv_desc_layout(const VkDescriptorSetLayout layout) { return *(struct nulldrv_desc_layout **) &layout; } @@ -2240,7 +2240,7 @@ ICD_EXPORT VkResult VKAPI vkAllocDescriptorSets( for (i = 0; i < count; i++) { const struct nulldrv_desc_layout *layout = - nulldrv_desc_layout((VkDescriptorSetLayout) pSetLayouts[i]); + nulldrv_desc_layout(pSetLayouts[i]); ret = nulldrv_desc_set_create(dev, pool, setUsage, layout, (struct nulldrv_desc_set **) &pDescriptorSets[i]); diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index e6b6753a..39a48bf6 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -1760,6 +1760,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkDestroyFramebuffer(VkDevice device, VkFramebuff } loader_platform_thread_unlock_mutex(&globalLock); VkResult result = get_dispatch_table(mem_tracker_device_table_map, device)->DestroyFramebuffer(device, framebuffer); + return result; } VK_LAYER_EXPORT VkResult VKAPI vkDestroyDynamicViewportState(VkDevice device, VkDynamicViewportState dynamicViewportState) diff --git a/layers/object_track.h b/layers/object_track.h index 636a090a..d163076c 100644 --- a/layers/object_track.h +++ b/layers/object_track.h @@ -343,7 +343,7 @@ static void validate_object(VkQueue dispatchable_object, VkBuffer object) { if (VkBufferMap.find((void*)object.handle) != VkBufferMap.end()) { log_msg(mdd(dispatchable_object), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, object.handle, 0, OBJTRACK_INVALID_OBJECT, "OBJTRACK", - "Invalid VkBuffer Object %p",reinterpret_cast(object.handle)); + "Invalid VkBuffer Object %p", object.handle); } } @@ -357,9 +357,9 @@ static void set_status(VkQueue dispatchable_object, VkFence object, VkDbgObjectT } else { // If we do not find it print an error - log_msg(mdd(dispatchable_object), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, reinterpret_cast(object.handle), 0, OBJTRACK_NONE, "OBJTRACK", + log_msg(mdd(dispatchable_object), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, object.handle, 0, OBJTRACK_NONE, "OBJTRACK", "Unable to set status for non-existent object 0x%" PRIxLEAST64 " of %s type", - reinterpret_cast(object.handle), string_VkDbgObjectType(objType)); + object.handle, string_VkDbgObjectType(objType)); } } } @@ -368,7 +368,7 @@ static void validate_object(VkQueue dispatchable_object, VkSemaphore object) { if (VkSemaphoreMap.find((void*)object.handle) == VkSemaphoreMap.end()) { log_msg(mdd(dispatchable_object), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, object.handle, 0, OBJTRACK_INVALID_OBJECT, "OBJTRACK", - "Invalid VkSemaphore Object %p",reinterpret_cast(object.handle)); + "Invalid VkSemaphore Object %p", object.handle); } } diff --git a/vk-layer-generate.py b/vk-layer-generate.py index 441a54cf..c44b0f85 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -1074,7 +1074,7 @@ class ObjectTrackerSubcommand(Subcommand): procs_txt.append('{') procs_txt.append(' log_msg(mdd(dispatchable_object), VK_DBG_REPORT_INFO_BIT, objType, vkObj.handle, 0, OBJTRACK_NONE, "OBJTRACK",') procs_txt.append(' "OBJ[%llu] : CREATE %s object 0x%" PRIxLEAST64 , object_track_index++, string_VkDbgObjectType(objType),') - procs_txt.append(' reinterpret_cast(vkObj.handle));') + procs_txt.append(' vkObj.handle);') procs_txt.append('') procs_txt.append(' OBJTRACK_NODE* pNewObjNode = new OBJTRACK_NODE;') procs_txt.append(' pNewObjNode->objType = objType;') @@ -1083,7 +1083,7 @@ class ObjectTrackerSubcommand(Subcommand): procs_txt.append(' pNewObjNode->vkObj = reinterpret_cast(vkObj);') procs_txt.append(' %sMap[vkObj] = pNewObjNode;' % (o)) else: - procs_txt.append(' pNewObjNode->vkObj = reinterpret_cast(vkObj.handle);') + procs_txt.append(' pNewObjNode->vkObj = vkObj.handle;') procs_txt.append(' %sMap[(void*)vkObj.handle] = pNewObjNode;' % (o)) procs_txt.append(' uint32_t objIndex = objTypeToIndex(objType);') procs_txt.append(' numObjs[objIndex]++;') @@ -1103,7 +1103,7 @@ class ObjectTrackerSubcommand(Subcommand): else: procs_txt.append(' if (%sMap.find((void*)object.handle) == %sMap.end()) {' % (o, o)) procs_txt.append(' log_msg(mdd(dispatchable_object), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, object.handle, 0, OBJTRACK_INVALID_OBJECT, "OBJTRACK",') - procs_txt.append(' "Invalid %s Object %%p",reinterpret_cast(object.handle));' % o) + procs_txt.append(' "Invalid %s Object %%p", object.handle);' % o) procs_txt.append(' }') procs_txt.append('}') procs_txt.append('') @@ -1132,7 +1132,7 @@ class ObjectTrackerSubcommand(Subcommand): else: procs_txt.append(' log_msg(mdd(dispatchable_object), VK_DBG_REPORT_INFO_BIT, pNode->objType, object.handle, 0, OBJTRACK_NONE, "OBJTRACK",') procs_txt.append(' "OBJ_STAT Destroy %s obj 0x%" PRIxLEAST64 " (%lu total objs remain & %lu %s objs).",') - procs_txt.append(' string_VkDbgObjectType(pNode->objType), reinterpret_cast(object.handle), numTotalObjs, numObjs[objIndex],') + procs_txt.append(' string_VkDbgObjectType(pNode->objType), object.handle, numTotalObjs, numObjs[objIndex],') procs_txt.append(' string_VkDbgObjectType(pNode->objType));') procs_txt.append(' delete pNode;') if o in [ 'VkInstance', 'VkPhysicalDevice', 'VkDevice', 'VkQueue', 'VkCmdBuffer']: @@ -1147,7 +1147,7 @@ class ObjectTrackerSubcommand(Subcommand): procs_txt.append(' } else {') procs_txt.append(' log_msg(mdd(dispatchable_object), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, object.handle, 0, OBJTRACK_NONE, "OBJTRACK",') procs_txt.append(' "Unable to remove obj 0x%" PRIxLEAST64 ". Was it created? Has it already been destroyed?",') - procs_txt.append(' reinterpret_cast(object.handle));') + procs_txt.append(' object.handle);') procs_txt.append(' }') procs_txt.append('}') procs_txt.append('') @@ -1176,7 +1176,7 @@ class ObjectTrackerSubcommand(Subcommand): else: procs_txt.append(' log_msg(mdd(dispatchable_object), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, object.handle, 0, OBJTRACK_NONE, "OBJTRACK",') procs_txt.append(' "Unable to set status for non-existent object 0x%" PRIxLEAST64 " of %s type",') - procs_txt.append(' reinterpret_cast(object.handle), string_VkDbgObjectType(objType));') + procs_txt.append(' object.handle, string_VkDbgObjectType(objType));') procs_txt.append(' }') procs_txt.append(' }') procs_txt.append('}') @@ -1201,7 +1201,6 @@ class ObjectTrackerSubcommand(Subcommand): procs_txt.append(' if (%sMap.find((void*)object.handle) != %sMap.end()) {' % (o, o)) procs_txt.append(' OBJTRACK_NODE* pNode = %sMap[(void*)object.handle];' % (o)) procs_txt.append(' if ((pNode->status & status_mask) != status_flag) {') - procs_txt.append(' char str[1024];') if o in [ 'VkInstance', 'VkPhysicalDevice', 'VkDevice', 'VkQueue', 'VkCmdBuffer']: procs_txt.append(' log_msg(mdd(dispatchable_object), msg_flags, pNode->objType, reinterpret_cast(object), 0, OBJTRACK_UNKNOWN_OBJECT, "OBJTRACK",') procs_txt.append(' "OBJECT VALIDATION WARNING: %s object 0x%" PRIxLEAST64 ": %s", string_VkDbgObjectType(objType),') @@ -1209,7 +1208,7 @@ class ObjectTrackerSubcommand(Subcommand): else: procs_txt.append(' log_msg(mdd(dispatchable_object), msg_flags, pNode->objType, object.handle, 0, OBJTRACK_UNKNOWN_OBJECT, "OBJTRACK",') procs_txt.append(' "OBJECT VALIDATION WARNING: %s object 0x%" PRIxLEAST64 ": %s", string_VkDbgObjectType(objType),') - procs_txt.append(' reinterpret_cast(object.handle), fail_msg);') + procs_txt.append(' object.handle, fail_msg);') procs_txt.append(' return VK_FALSE;') procs_txt.append(' }') procs_txt.append(' return VK_TRUE;') @@ -1223,7 +1222,7 @@ class ObjectTrackerSubcommand(Subcommand): else: procs_txt.append(' log_msg(mdd(dispatchable_object), msg_flags, (VkDbgObjectType) 0, object.handle, 0, OBJTRACK_UNKNOWN_OBJECT, "OBJTRACK",') procs_txt.append(' "Unable to obtain status for non-existent object 0x%" PRIxLEAST64 " of %s type",') - procs_txt.append(' reinterpret_cast(object.handle), string_VkDbgObjectType(objType));') + procs_txt.append(' object.handle, string_VkDbgObjectType(objType));') procs_txt.append(' return VK_FALSE;') procs_txt.append(' }') procs_txt.append('}') @@ -1251,7 +1250,7 @@ class ObjectTrackerSubcommand(Subcommand): else: procs_txt.append(' log_msg(mdd(dispatchable_object), VK_DBG_REPORT_ERROR_BIT, objType, object.handle, 0, OBJTRACK_UNKNOWN_OBJECT, "OBJTRACK",') procs_txt.append(' "Unable to reset status for non-existent object 0x%" PRIxLEAST64 " of %s type",') - procs_txt.append(' reinterpret_cast(object.handle), string_VkDbgObjectType(objType));') + procs_txt.append(' object.handle, string_VkDbgObjectType(objType));') procs_txt.append(' }') procs_txt.append('}') procs_txt.append('') @@ -1275,7 +1274,7 @@ class ObjectTrackerSubcommand(Subcommand): gedi_txt.append(' OBJTRACK_NODE* pNode = it->second;') gedi_txt.append(' log_msg(mid(instance), VK_DBG_REPORT_ERROR_BIT, pNode->objType, pNode->vkObj, 0, OBJTRACK_OBJECT_LEAK, "OBJTRACK",') gedi_txt.append(' "OBJ ERROR : %s object 0x%" PRIxLEAST64 " has not been destroyed.", string_VkDbgObjectType(pNode->objType),') - gedi_txt.append(' reinterpret_cast(pNode->vkObj));') + gedi_txt.append(' pNode->vkObj);') gedi_txt.append(' }') gedi_txt.append('') gedi_txt.append(' dispatch_key key = get_dispatch_key(instance);') @@ -1318,7 +1317,7 @@ class ObjectTrackerSubcommand(Subcommand): gedd_txt.append(' OBJTRACK_NODE* pNode = it->second;') gedd_txt.append(' log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, pNode->objType, pNode->vkObj, 0, OBJTRACK_OBJECT_LEAK, "OBJTRACK",') gedd_txt.append(' "OBJ ERROR : %s object 0x%" PRIxLEAST64 " has not been destroyed.", string_VkDbgObjectType(pNode->objType),') - gedd_txt.append(' reinterpret_cast(pNode->vkObj));') + gedd_txt.append(' pNode->vkObj);') gedd_txt.append(' }') gedd_txt.append('') gedd_txt.append(" // Clean up Queue's MemRef Linked Lists") @@ -1346,7 +1345,7 @@ class ObjectTrackerSubcommand(Subcommand): cbv_txt.append('{') cbv_txt.append(' if (%sMap.find((void*)object.handle) == %sMap.end()) {' % (o, o)) cbv_txt.append(' log_msg(mdd(dispatchable_object), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, object.handle, 0, OBJTRACK_INVALID_OBJECT, "OBJTRACK",') - cbv_txt.append(' "Invalid %s Object %%p",reinterpret_cast(object.handle));' % (o)) + cbv_txt.append(' "Invalid %s Object %%p", object.handle);' % (o)) cbv_txt.append(' }') cbv_txt.append('}') cbv_txt.append('') -- cgit v1.2.3