From 2aa7ad5e6716ac01b2b43fa68e4b5d50aaf00944 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 14 Jan 2021 16:10:20 +0100 Subject: [PATCH] qvkgen: Skip command elements with alias Otherwise we end up with generating broken qvulkanfunctions cpp and h files. For example, encountering the following command element should lead to taking no action, this is not something we want to emit a corresponding wrapper function for: This is required to be able to upgrade the bundled vk.xml to something newer. Fixes: QTBUG-90330 Task-number: QTBUG-90219 Change-Id: Ie6e3a8794207e30a172820eb055238bf52a0c0b9 Reviewed-by: Andy Nichols --- src/tools/qvkgen/qvkgen.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tools/qvkgen/qvkgen.cpp b/src/tools/qvkgen/qvkgen.cpp index 0664f6f5db..8135678fe1 100644 --- a/src/tools/qvkgen/qvkgen.cpp +++ b/src/tools/qvkgen/qvkgen.cpp @@ -104,8 +104,11 @@ void VkSpecParser::parseCommands() m_reader.readNext(); if (m_reader.isEndElement() && m_reader.name() == QStringLiteral("commands")) return; - if (m_reader.isStartElement() && m_reader.name() == u"command") - m_commands.append(parseCommand()); + if (m_reader.isStartElement() && m_reader.name() == u"command") { + const Command c = parseCommand(); + if (!c.cmd.name.isEmpty()) // skip aliases + m_commands.append(c); + } } }