From 6d32ef8d5fb45e4cbfa686bc967bd4fce3387f7a Mon Sep 17 00:00:00 2001 From: Jeremy Kniager Date: Wed, 5 Dec 2018 12:22:46 -0700 Subject: vulkaninfo: Fix extra lines in HTML file Removed the extra line breaks appearing after certain data structures listed in the HTML output file of Vulkan Info. --- vulkaninfo/vulkaninfo.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/vulkaninfo/vulkaninfo.c b/vulkaninfo/vulkaninfo.c index 7b093449..4d4838ce 100644 --- a/vulkaninfo/vulkaninfo.c +++ b/vulkaninfo/vulkaninfo.c @@ -2033,7 +2033,7 @@ static void AppGpuDumpFeatures(const struct AppGpu *gpu, FILE *out) { if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR && CheckPhysicalDeviceExtensionIncluded(VK_KHR_8BIT_STORAGE_EXTENSION_NAME, gpu->device_extensions, gpu->device_extension_count)) { VkPhysicalDevice8BitStorageFeaturesKHR *b8_store_features = (VkPhysicalDevice8BitStorageFeaturesKHR*)structure; if (html_output) { - fprintf(out, "\n\t\t\t\t\t
VkPhysicalDevice8BitStorageFeatures\n"); + fprintf(out, "\t\t\t\t\t
VkPhysicalDevice8BitStorageFeatures\n"); fprintf(out, "\t\t\t\t\t\t
storageBuffer8BitAccess =
%u
\n", b8_store_features->storageBuffer8BitAccess); fprintf(out, "\t\t\t\t\t\t
uniformAndStorageBuffer8BitAccess =
%u
\n", b8_store_features->uniformAndStorageBuffer8BitAccess); fprintf(out, "\t\t\t\t\t\t
storagePushConstant8 =
%u
\n", b8_store_features->storagePushConstant8); @@ -2049,7 +2049,7 @@ static void AppGpuDumpFeatures(const struct AppGpu *gpu, FILE *out) { } else if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES_KHR && CheckPhysicalDeviceExtensionIncluded(VK_KHR_16BIT_STORAGE_EXTENSION_NAME, gpu->device_extensions, gpu->device_extension_count)) { VkPhysicalDevice16BitStorageFeaturesKHR *b16_store_features = (VkPhysicalDevice16BitStorageFeaturesKHR*)structure; if (html_output) { - fprintf(out, "\n\t\t\t\t\t
VkPhysicalDevice16BitStorageFeatures\n"); + fprintf(out, "\t\t\t\t\t
VkPhysicalDevice16BitStorageFeatures\n"); fprintf(out, "\t\t\t\t\t\t
storageBuffer16BitAccess =
%u
\n", b16_store_features->storageBuffer16BitAccess ); fprintf(out, "\t\t\t\t\t\t
uniformAndStorageBuffer16BitAccess =
%u
\n", b16_store_features->uniformAndStorageBuffer16BitAccess); fprintf(out, "\t\t\t\t\t\t
storagePushConstant16 =
%u
\n", b16_store_features->storagePushConstant16 ); @@ -2066,7 +2066,7 @@ static void AppGpuDumpFeatures(const struct AppGpu *gpu, FILE *out) { } else if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES_KHR && CheckPhysicalDeviceExtensionIncluded(VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME, gpu->device_extensions, gpu->device_extension_count)) { VkPhysicalDeviceSamplerYcbcrConversionFeaturesKHR *sampler_ycbcr_features = (VkPhysicalDeviceSamplerYcbcrConversionFeaturesKHR*)structure; if (html_output) { - fprintf(out, "\n\t\t\t\t\t
VkPhysicalDeviceSamplerYcbcrConversionFeatures\n"); + fprintf(out, "\t\t\t\t\t
VkPhysicalDeviceSamplerYcbcrConversionFeatures\n"); fprintf(out, "\t\t\t\t\t\t
samplerYcbcrConversion =
%u
\n", sampler_ycbcr_features->samplerYcbcrConversion); fprintf(out, "\t\t\t\t\t
\n"); } else if (human_readable_output) { @@ -2077,7 +2077,7 @@ static void AppGpuDumpFeatures(const struct AppGpu *gpu, FILE *out) { } else if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES_KHR && CheckPhysicalDeviceExtensionIncluded(VK_KHR_VARIABLE_POINTERS_EXTENSION_NAME, gpu->device_extensions, gpu->device_extension_count)) { VkPhysicalDeviceVariablePointerFeaturesKHR *var_pointer_features = (VkPhysicalDeviceVariablePointerFeaturesKHR*)structure; if (html_output) { - fprintf(out, "\n\t\t\t\t\t
VkPhysicalDeviceVariablePointerFeatures\n"); + fprintf(out, "\t\t\t\t\t
VkPhysicalDeviceVariablePointerFeatures\n"); fprintf(out, "\t\t\t\t\t\t
variablePointersStorageBuffer =
%u
\n", var_pointer_features->variablePointersStorageBuffer); fprintf(out, "\t\t\t\t\t\t
variablePointers =
%u
\n", var_pointer_features->variablePointers ); fprintf(out, "\t\t\t\t\t
\n"); @@ -2090,7 +2090,7 @@ static void AppGpuDumpFeatures(const struct AppGpu *gpu, FILE *out) { } else if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_FEATURES_EXT && CheckPhysicalDeviceExtensionIncluded(VK_EXT_BLEND_OPERATION_ADVANCED_EXTENSION_NAME, gpu->device_extensions, gpu->device_extension_count)) { VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT *blend_op_adv_features = (VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT*)structure; if (html_output) { - fprintf(out, "\n\t\t\t\t\t
VkPhysicalDeviceBlendOperationAdvancedFeatures\n"); + fprintf(out, "\t\t\t\t\t
VkPhysicalDeviceBlendOperationAdvancedFeatures\n"); fprintf(out, "\t\t\t\t\t\t
advancedBlendCoherentOperations =
%u
\n", blend_op_adv_features->advancedBlendCoherentOperations); fprintf(out, "\t\t\t\t\t
\n"); } else if (human_readable_output) { @@ -2101,7 +2101,7 @@ static void AppGpuDumpFeatures(const struct AppGpu *gpu, FILE *out) { } else if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR && CheckPhysicalDeviceExtensionIncluded(VK_KHR_MULTIVIEW_EXTENSION_NAME, gpu->device_extensions, gpu->device_extension_count)) { VkPhysicalDeviceMultiviewFeaturesKHR *multiview_features = (VkPhysicalDeviceMultiviewFeaturesKHR*)structure; if (html_output) { - fprintf(out, "\n\t\t\t\t\t
VkPhysicalDeviceMultiviewFeatures\n"); + fprintf(out, "\t\t\t\t\t
VkPhysicalDeviceMultiviewFeatures\n"); fprintf(out, "\t\t\t\t\t\t
multiview =
%u
\n", multiview_features->multiview ); fprintf(out, "\t\t\t\t\t\t
multiviewGeometryShader =
%u
\n", multiview_features->multiviewGeometryShader ); fprintf(out, "\t\t\t\t\t\t
multiviewTessellationShader =
%u
\n", multiview_features->multiviewTessellationShader); @@ -2598,7 +2598,7 @@ static void AppGpuDumpProps(const struct AppGpu *gpu, FILE *out) { if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_PROPERTIES_EXT && CheckPhysicalDeviceExtensionIncluded(VK_EXT_BLEND_OPERATION_ADVANCED_EXTENSION_NAME, gpu->device_extensions, gpu->device_extension_count)) { VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT *blend_op_adv_props = (VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT*)structure; if (html_output) { - fprintf(out, "\n\t\t\t\t\t
VkPhysicalDeviceBlendOperationAdvancedProperties\n"); + fprintf(out, "\t\t\t\t\t
VkPhysicalDeviceBlendOperationAdvancedProperties\n"); fprintf(out, "\t\t\t\t\t\t
advancedBlendMaxColorAttachments =
%u
\n", blend_op_adv_props->advancedBlendMaxColorAttachments ); fprintf(out, "\t\t\t\t\t\t
advancedBlendIndependentBlend =
%u
\n", blend_op_adv_props->advancedBlendIndependentBlend ); fprintf(out, "\t\t\t\t\t\t
advancedBlendNonPremultipliedSrcColor =
%u
\n", blend_op_adv_props->advancedBlendNonPremultipliedSrcColor); @@ -2619,7 +2619,7 @@ static void AppGpuDumpProps(const struct AppGpu *gpu, FILE *out) { } else if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES_KHR && CheckPhysicalDeviceExtensionIncluded(VK_KHR_MAINTENANCE2_EXTENSION_NAME, gpu->device_extensions, gpu->device_extension_count)) { VkPhysicalDevicePointClippingPropertiesKHR *pt_clip_props = (VkPhysicalDevicePointClippingPropertiesKHR*)structure; if (html_output) { - fprintf(out, "\n\t\t\t\t\t
VkPhysicalDevicePointClippingProperties\n"); + fprintf(out, "\t\t\t\t\t
VkPhysicalDevicePointClippingProperties\n"); fprintf(out, "\t\t\t\t\t\t
pointClippingBehavior =
%u
\n", pt_clip_props->pointClippingBehavior); fprintf(out, "\t\t\t\t\t
\n"); } else if (human_readable_output) { @@ -2630,7 +2630,7 @@ static void AppGpuDumpProps(const struct AppGpu *gpu, FILE *out) { } else if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR && CheckPhysicalDeviceExtensionIncluded(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, gpu->device_extensions, gpu->device_extension_count)) { VkPhysicalDevicePushDescriptorPropertiesKHR *push_desc_props = (VkPhysicalDevicePushDescriptorPropertiesKHR*)structure; if (html_output) { - fprintf(out, "\n\t\t\t\t\t
VkPhysicalDevicePushDescriptorProperties\n"); + fprintf(out, "\t\t\t\t\t
VkPhysicalDevicePushDescriptorProperties\n"); fprintf(out, "\t\t\t\t\t\t
maxPushDescriptors =
%u
\n", push_desc_props->maxPushDescriptors); fprintf(out, "\t\t\t\t\t
\n"); } else if (human_readable_output) { @@ -2641,7 +2641,7 @@ static void AppGpuDumpProps(const struct AppGpu *gpu, FILE *out) { } else if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT && CheckPhysicalDeviceExtensionIncluded(VK_EXT_DISCARD_RECTANGLES_EXTENSION_NAME, gpu->device_extensions, gpu->device_extension_count)) { VkPhysicalDeviceDiscardRectanglePropertiesEXT *discard_rect_props = (VkPhysicalDeviceDiscardRectanglePropertiesEXT*)structure; if (html_output) { - fprintf(out, "\n\t\t\t\t\t
VkPhysicalDeviceDiscardRectangleProperties\n"); + fprintf(out, "\t\t\t\t\t
VkPhysicalDeviceDiscardRectangleProperties\n"); fprintf(out, "\t\t\t\t\t\t
maxDiscardRectangles =
%u
\n", discard_rect_props->maxDiscardRectangles); fprintf(out, "\t\t\t\t\t
\n"); } else if (human_readable_output) { @@ -2652,7 +2652,7 @@ static void AppGpuDumpProps(const struct AppGpu *gpu, FILE *out) { } else if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR && CheckPhysicalDeviceExtensionIncluded(VK_KHR_MULTIVIEW_EXTENSION_NAME, gpu->device_extensions, gpu->device_extension_count)) { VkPhysicalDeviceMultiviewPropertiesKHR *multiview_props = (VkPhysicalDeviceMultiviewPropertiesKHR*)structure; if (html_output) { - fprintf(out, "\n\t\t\t\t\t
VkPhysicalDeviceMultiviewProperties\n"); + fprintf(out, "\t\t\t\t\t
VkPhysicalDeviceMultiviewProperties\n"); fprintf(out, "\t\t\t\t\t\t
maxMultiviewViewCount =
%u
\n", multiview_props->maxMultiviewViewCount ); fprintf(out, "\t\t\t\t\t\t
maxMultiviewInstanceIndex =
%u
\n", multiview_props->maxMultiviewInstanceIndex); fprintf(out, "\t\t\t\t\t
\n"); @@ -2665,7 +2665,7 @@ static void AppGpuDumpProps(const struct AppGpu *gpu, FILE *out) { } else if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES_KHR) { VkPhysicalDeviceMaintenance3PropertiesKHR *maintenance3_props = (VkPhysicalDeviceMaintenance3PropertiesKHR*)structure; if (html_output) { - fprintf(out, "\n\t\t\t\t\t
VkPhysicalDeviceMaintenance3Properties\n"); + fprintf(out, "\t\t\t\t\t
VkPhysicalDeviceMaintenance3Properties\n"); fprintf(out, "\t\t\t\t\t\t
maxPerSetDescriptors =
%" PRIuLEAST32 "
\n", maintenance3_props->maxPerSetDescriptors); fprintf(out, "\t\t\t\t\t\t
maxMemoryAllocationSize =
%" PRIuLEAST64 "
\n", maintenance3_props->maxMemoryAllocationSize); fprintf(out, "\t\t\t\t\t
\n"); @@ -2678,7 +2678,7 @@ static void AppGpuDumpProps(const struct AppGpu *gpu, FILE *out) { } else if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHR) { const VkPhysicalDeviceIDPropertiesKHR *id_props = (VkPhysicalDeviceIDPropertiesKHR*)structure; if (html_output) { - fprintf(out, "\n\t\t\t\t\t
VkPhysicalDeviceIDProperties\n"); + fprintf(out, "\t\t\t\t\t
VkPhysicalDeviceIDProperties\n"); // Visual Studio 2013's printf does not support the "hh" // length modifier so cast the operands and use field width // "2" to fake it. -- cgit v1.2.3