aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Giessen <charles@lunarg.com>2021-05-11 11:14:18 -0600
committerCharles Giessen <46324611+charles-lunarg@users.noreply.github.com>2021-05-11 14:48:22 -0600
commit6407a0c8a489be9cbe3aefd0b4d603d7ed230673 (patch)
treedb9e903c9ce5dd4f737c5164f0186d9550e759b0
parent535fc409129830f17160ab1e19ea2ac79916d96f (diff)
downloadusermoji-6407a0c8a489be9cbe3aefd0b4d603d7ed230673.tar.xz
vulkaninfo: Add pipelineUUID printing to text,html
Change-Id: Ia9b1679188505a765c33b14aab46749f823f4a23
-rw-r--r--vulkaninfo/vulkaninfo.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/vulkaninfo/vulkaninfo.cpp b/vulkaninfo/vulkaninfo.cpp
index 3c7107bc..9de78a62 100644
--- a/vulkaninfo/vulkaninfo.cpp
+++ b/vulkaninfo/vulkaninfo.cpp
@@ -307,18 +307,13 @@ void GpuDumpProps(Printer &p, AppGpu &gpu) {
p.SetSubHeader();
{
ObjectWrapper obj(p, "VkPhysicalDeviceProperties");
- p.PrintKeyValue("apiVersion", props.apiVersion, 14, VkVersionString(props.apiVersion));
- p.PrintKeyValue("driverVersion", props.driverVersion, 14, to_hex_str(props.driverVersion));
- p.PrintKeyString("vendorID", to_hex_str(props.vendorID), 14);
- p.PrintKeyString("deviceID", to_hex_str(props.deviceID), 14);
- p.PrintKeyString("deviceType", VkPhysicalDeviceTypeString(props.deviceType), 14);
- p.PrintKeyString("deviceName", props.deviceName, 14);
- if (p.Type() == OutputType::vkconfig_output) {
- ArrayWrapper arr(p, "pipelineCacheUUID", VK_UUID_SIZE);
- for (uint32_t i = 0; i < VK_UUID_SIZE; ++i) {
- p.PrintElement(static_cast<uint32_t>(props.pipelineCacheUUID[i]));
- }
- }
+ p.PrintKeyValue("apiVersion", props.apiVersion, 17, VkVersionString(props.apiVersion));
+ p.PrintKeyValue("driverVersion", props.driverVersion, 17, to_hex_str(props.driverVersion));
+ p.PrintKeyString("vendorID", to_hex_str(props.vendorID), 17);
+ p.PrintKeyString("deviceID", to_hex_str(props.deviceID), 17);
+ p.PrintKeyString("deviceType", VkPhysicalDeviceTypeString(props.deviceType), 17);
+ p.PrintKeyString("deviceName", props.deviceName, 17);
+ p.PrintKeyString("pipelineCacheUUID", to_string_16(props.pipelineCacheUUID), 17);
}
p.AddNewline();
DumpVkPhysicalDeviceLimits(p, "VkPhysicalDeviceLimits",