From 32d6c50316b020a2845be8145cebc32acf818ea8 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Thu, 1 Dec 2016 13:11:39 -0700 Subject: layers:Kill print_mem_list function Killing the print_mem_list function that would dump details of memory allocations for a number of functions. This function is a vestige of the original validation layers when more debug info was useful. Now there are alternate tools and layers that can produce this type of info so it's extraneous in the validation layers. --- layers/core_validation.cpp | 69 ---------------------------------------------- 1 file changed, 69 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index d2b83aa0..22f56bc4 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -858,65 +858,6 @@ static bool get_mem_for_type(layer_data *dev_data, uint64_t handle, VkDebugRepor return skip_call; } -// Print details of MemObjInfo list -static void print_mem_list(layer_data *dev_data) { - // Early out if info is not requested - if (!(dev_data->report_data->active_flags & VK_DEBUG_REPORT_INFORMATION_BIT_EXT)) { - return; - } - - // Just printing each msg individually for now, may want to package these into single large print - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, 0, __LINE__, - MEMTRACK_NONE, "MEM", "Details of Memory Object list (of size " PRINTF_SIZE_T_SPECIFIER " elements)", - dev_data->memObjMap.size()); - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, 0, __LINE__, - MEMTRACK_NONE, "MEM", "============================="); - - if (dev_data->memObjMap.size() <= 0) - return; - - for (auto ii = dev_data->memObjMap.begin(); ii != dev_data->memObjMap.end(); ++ii) { - auto mem_info = (*ii).second.get(); - - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, 0, - __LINE__, MEMTRACK_NONE, "MEM", " ===MemObjInfo at 0x%p===", (void *)mem_info); - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, 0, - __LINE__, MEMTRACK_NONE, "MEM", " Mem object: 0x%" PRIxLEAST64, (uint64_t)(mem_info->mem)); - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, 0, - __LINE__, MEMTRACK_NONE, "MEM", " Ref Count: " PRINTF_SIZE_T_SPECIFIER, - mem_info->cb_bindings.size() + mem_info->obj_bindings.size()); - if (0 != mem_info->alloc_info.allocationSize) { - string pAllocInfoMsg = vk_print_vkmemoryallocateinfo(&mem_info->alloc_info, "MEM(INFO): "); - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, 0, - __LINE__, MEMTRACK_NONE, "MEM", " Mem Alloc info:\n%s", pAllocInfoMsg.c_str()); - } else { - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, 0, - __LINE__, MEMTRACK_NONE, "MEM", " Mem Alloc info is NULL (alloc done by vkCreateSwapchainKHR())"); - } - - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, 0, - __LINE__, MEMTRACK_NONE, "MEM", " VK OBJECT Binding list of size " PRINTF_SIZE_T_SPECIFIER " elements:", - mem_info->obj_bindings.size()); - if (mem_info->obj_bindings.size() > 0) { - for (auto obj : mem_info->obj_bindings) { - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, - 0, __LINE__, MEMTRACK_NONE, "MEM", " VK OBJECT 0x%" PRIx64, obj.handle); - } - } - - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, 0, - __LINE__, MEMTRACK_NONE, "MEM", - " VK Command Buffer (CB) binding list of size " PRINTF_SIZE_T_SPECIFIER " elements", - mem_info->cb_bindings.size()); - if (mem_info->cb_bindings.size() > 0) { - for (auto cb : mem_info->cb_bindings) { - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, - 0, __LINE__, MEMTRACK_NONE, "MEM", " VK command buffer 0x%p", cb); - } - } - } -} - static void printCBList(layer_data *my_data) { GLOBAL_CB_NODE *pCBInfo = NULL; @@ -4517,11 +4458,6 @@ VKAPI_ATTR void VKAPI_CALL DestroyDevice(VkDevice device, const VkAllocationCall dev_data->bufferMap.clear(); // Queues persist until device is destroyed dev_data->queueMap.clear(); - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, - (uint64_t)device, __LINE__, MEMTRACK_NONE, "MEM", "Printing List details prior to vkDestroyDevice()"); - log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, - (uint64_t)device, __LINE__, MEMTRACK_NONE, "MEM", "================================================"); - print_mem_list(dev_data); printCBList(dev_data); // Report any memory leaks DEVICE_MEM_INFO *pInfo = NULL; @@ -4993,7 +4929,6 @@ QueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, V } // TODO : Review these old print functions and clean up as appropriate - print_mem_list(dev_data); printCBList(dev_data); // Mark the fence in-use. @@ -5113,7 +5048,6 @@ static bool PreCallValidateAllocateMemory(layer_data *dev_data) { static void PostCallRecordAllocateMemory(layer_data *dev_data, const VkMemoryAllocateInfo *pAllocateInfo, VkDeviceMemory *pMemory) { add_mem_obj_info(dev_data, dev_data->device, *pMemory, pAllocateInfo); - print_mem_list(dev_data); return; } @@ -5971,7 +5905,6 @@ BindBufferMemory(VkDevice device, VkBuffer buffer, VkDeviceMemory mem, VkDeviceS } } } - print_mem_list(dev_data); lock.unlock(); if (!skip_call) { result = dev_data->dispatch_table.BindBufferMemory(device, buffer, mem, memoryOffset); @@ -11440,7 +11373,6 @@ VKAPI_ATTR VkResult VKAPI_CALL BindImageMemory(VkDevice device, VkImage image, V skip_call |= ValidateMemoryTypes(dev_data, mem_info, image_state->requirements.memoryTypeBits, "vkBindImageMemory"); } - print_mem_list(dev_data); lock.unlock(); if (!skip_call) { result = dev_data->dispatch_table.BindImageMemory(device, image, mem, memoryOffset); @@ -11598,7 +11530,6 @@ QueueBindSparse(VkQueue queue, uint32_t bindInfoCount, const VkBindSparseInfo *p fence); } - print_mem_list(dev_data); lock.unlock(); if (!skip_call) -- cgit v1.2.3