From f6b35b64a6e7ead451c921aaa077d1e988f02443 Mon Sep 17 00:00:00 2001
From: Jeremy Kniager <jeremyk@lunarg.com>
Date: Mon, 7 Jan 2019 11:31:19 -0700
Subject: [PATCH] vulkaninfo: Add VK_EXT_scalar_block_layout

Added output for the following structure from
extension VK_EXT_scalar_block_layout:

    VkPhysicalDeviceScalarBlockLayoutFeaturesEXT

Change-Id: I63cf81d7f690060a3d1b81c57ac0dc4e3cda457e
---
 vulkaninfo/vulkaninfo.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/vulkaninfo/vulkaninfo.c b/vulkaninfo/vulkaninfo.c
index a02991e..b9d8c63 100644
--- a/vulkaninfo/vulkaninfo.c
+++ b/vulkaninfo/vulkaninfo.c
@@ -1099,7 +1099,9 @@ static void AppGpuInit(struct AppGpu *gpu, struct AppInstance *inst, uint32_t id
             {.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR,
              .mem_size = sizeof(VkPhysicalDeviceShaderAtomicInt64FeaturesKHR)},
             {.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT,
-             .mem_size = sizeof(VkPhysicalDeviceTransformFeedbackFeaturesEXT)}};
+             .mem_size = sizeof(VkPhysicalDeviceTransformFeedbackFeaturesEXT)},
+            {.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT,
+             .mem_size = sizeof(VkPhysicalDeviceScalarBlockLayoutFeaturesEXT)}};
 
         uint32_t chain_info_len = ARRAY_SIZE(chain_info);
 
@@ -2354,6 +2356,17 @@ static void AppGpuDumpFeatures(const struct AppGpu *gpu, FILE *out) {
                     printf("\ttransformFeedback = %" PRIuLEAST32 "\n", transform_feedback_features->transformFeedback);
                     printf("\tgeometryStreams   = %" PRIuLEAST32 "\n", transform_feedback_features->geometryStreams);
                 }
+            } else if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT && CheckPhysicalDeviceExtensionIncluded(VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME, gpu->device_extensions, gpu->device_extension_count)) {
+                VkPhysicalDeviceScalarBlockLayoutFeaturesEXT *scalar_block_layout_features = (VkPhysicalDeviceScalarBlockLayoutFeaturesEXT*)structure;
+                if (html_output) {
+                    fprintf(out, "\n\t\t\t\t\t<details><summary>VkPhysicalDeviceScalarBlockLayoutFeatures</summary>\n");
+                    fprintf(out, "\t\t\t\t\t\t<details><summary>scalarBlockLayout = <div class='val'>%" PRIuLEAST32 "</div></summary></details>\n", scalar_block_layout_features->scalarBlockLayout);
+                }
+                else if (human_readable_output) {
+                    printf("\nVkPhysicalDeviceScalarBlockLayoutFeatures:\n");
+                    printf("==========================================\n");
+                    printf("\tscalarBlockLayout = %" PRIuLEAST32 "\n", scalar_block_layout_features->scalarBlockLayout);
+                }
             }
             place = structure->pNext;
         }
-- 
2.7.4