mirror/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2024-11-10 10:41:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve the way sizes like "32 MiB" are printed in VmaDumpVis

Browse Source 
Also bumped some version numbers and dates.
This commit is contained in:
Adam Sawicki 2019-07-02 15:49:12 +02:00
parent 2024cc570a
commit 195016b034
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vk_mem_alloc.h
View File

@ -29,7 +29,7 @@ extern "C" {
/** \mainpage Vulkan Memory Allocator /** \mainpage Vulkan Memory Allocator
<b>Version 2.3.0-development</b> (2019-03-05) <b>Version 2.3.0-development</b> (2019-07-02)
Copyright (c) 2017-2018 Advanced Micro Devices, Inc. All rights reserved. \n Copyright (c) 2017-2018 Advanced Micro Devices, Inc. All rights reserved. \n
License: MIT License: MIT

17
tools/VmaDumpVis/VmaDumpVis.py
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved. # Copyright (c) 2018-2019 Advanced Micro Devices, Inc. All rights reserved.
# #
# Permission is hereby granted, free of charge, to any person obtaining a copy # Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal # of this software and associated documentation files (the "Software"), to deal
@ -25,7 +25,7 @@ import json
from PIL import Image, ImageDraw, ImageFont from PIL import Image, ImageDraw, ImageFont
PROGRAM_VERSION = 'VMA Dump Visualization 2.0.0' PROGRAM_VERSION = 'VMA Dump Visualization 2.0.1'
IMG_SIZE_X = 800 IMG_SIZE_X = 800
IMG_MARGIN = 8 IMG_MARGIN = 8
FONT_SIZE = 10 FONT_SIZE = 10
@ -216,13 +216,18 @@ iBytesBetweenGridLines = 32
while iBytesBetweenGridLines * fPixelsPerByte < 64: while iBytesBetweenGridLines * fPixelsPerByte < 64:
iBytesBetweenGridLines *= 2 iBytesBetweenGridLines *= 2
iByte = 0 iByte = 0
TEXT_MARGIN = 4
while True: while True:
iX = int(iByte * fPixelsPerByte) iX = int(iByte * fPixelsPerByte)
if iX > IMG_SIZE_X - 2 * IMG_MARGIN: if iX > IMG_SIZE_X - 2 * IMG_MARGIN:
break break
draw.line([iX + IMG_MARGIN, 0, iX + IMG_MARGIN, iImgSizeY], fill=COLOR_GRID_LINE) draw.line([iX + IMG_MARGIN, 0, iX + IMG_MARGIN, iImgSizeY], fill=COLOR_GRID_LINE)
if iX + 32 < IMG_SIZE_X - 2 * IMG_MARGIN: if iByte == 0:
draw.text((iX + IMG_MARGIN + FONT_SIZE/4, y), BytesToStr(iByte), fill=COLOR_TEXT_H2, font=font) draw.text((iX + IMG_MARGIN + TEXT_MARGIN, y), "0", fill=COLOR_TEXT_H2, font=font)
else:
text = BytesToStr(iByte)
textSize = draw.textsize(text, font=font)
draw.text((iX + IMG_MARGIN - textSize[0] - TEXT_MARGIN, y), text, fill=COLOR_TEXT_H2, font=font)
iByte += iBytesBetweenGridLines iByte += iBytesBetweenGridLines
y += FONT_SIZE + IMG_MARGIN y += FONT_SIZE + IMG_MARGIN
@ -247,9 +252,9 @@ for iMemTypeIndex in sorted(data.keys()):
for iPoolId, listPool in dictMemType['CustomPools'].items(): for iPoolId, listPool in dictMemType['CustomPools'].items():
for objBlock in listPool: for objBlock in listPool:
if 'Algorithm' in objBlock and objBlock['Algorithm']: if 'Algorithm' in objBlock and objBlock['Algorithm']:
sAlgorithm = ' (Algorithm: %s)' % (objBlock['Algorithm']); sAlgorithm = ' (Algorithm: %s)' % (objBlock['Algorithm'])
else: else:
sAlgorithm = ''; sAlgorithm = ''
draw.text((IMG_MARGIN, y), "Custom pool %d%s block %d" % (iPoolId, sAlgorithm, objBlock['ID']), fill=COLOR_TEXT_H2, font=font) draw.text((IMG_MARGIN, y), "Custom pool %d%s block %d" % (iPoolId, sAlgorithm, objBlock['ID']), fill=COLOR_TEXT_H2, font=font)
y += FONT_SIZE + IMG_MARGIN y += FONT_SIZE + IMG_MARGIN
DrawBlock(draw, y, objBlock) DrawBlock(draw, y, objBlock)