Fix logging of VkExtensionProperties::extensionName

Change-Id: Ibcee478082bd64c7c352f47dcf20230d08d9c7dd

diff --git a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
index 3b29125..021b7ab 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
+++ b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
@@ -1681,7 +1681,7 @@ std::ostream& operator<< (std::ostream& s, const VkDeviceCreateInfo& value)
 std::ostream& operator<< (std::ostream& s, const VkExtensionProperties& value)
 {
        s << "VkExtensionProperties = {\n";
-       s << "\textensionName = " << '\n' << tcu::formatArray(tcu::Format::HexIterator<char>(DE_ARRAY_BEGIN(value.extensionName)), tcu::Format::HexIterator<char>(DE_ARRAY_END(value.extensionName))) << '\n';
+       s << "\textensionName = " << (const char*)value.extensionName << '\n';
        s << "\tspecVersion = " << value.specVersion << '\n';
        s << '}';
        return s;

diff --git a/external/vulkancts/gen_framework.py b/external/vulkancts/gen_framework.py
index ed72536..e27b26b 100644 (file)
--- a/external/vulkancts/gen_framework.py
+++ b/external/vulkancts/gen_framework.py
@@ -547,7 +547,7 @@ def writeStrUtilImpl (api, filename):
                                        valFmt = "getCharPtrStr(value.%s)" % member.name
                                elif '[' in member.name:
                                        baseName = member.name[:member.name.find('[')]
-                                       if baseName in ["extName", "deviceName", "layerName", "description"]:
+                                       if baseName in ["extensionName", "deviceName", "layerName", "description"]:
                                                valFmt = "(const char*)value.%s" % baseName
                                        elif member.type == 'char' or member.type == 'deUint8':
                                                newLine = "'\\n' << "