From 82a14093cfb3f11da82d3b080ab650ce36a5ba13 Mon Sep 17 00:00:00 2001 From: Markus Tavenrath Date: Tue, 20 Feb 2018 11:23:54 +0100 Subject: [PATCH] Don't fail on new platforms tag (#188) --- VulkanHppGenerator.cpp | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index da35874..e8329a0 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -28,9 +28,9 @@ const std::string vkNamespace = R"( #define VULKAN_HPP_NAMESPACE vk #endif -#define VULKAN_HPP_STRINGIFY2(text) #text -#define VULKAN_HPP_STRINGIFY(text) VULKAN_HPP_STRINGIFY2(text) -#define VULKAN_HPP_NAMESPACE_STRING VULKAN_HPP_STRINGIFY(VULKAN_HPP_NAMESPACE) +#define VULKAN_HPP_STRINGIFY2(text) #text +#define VULKAN_HPP_STRINGIFY(text) VULKAN_HPP_STRINGIFY2(text) +#define VULKAN_HPP_NAMESPACE_STRING VULKAN_HPP_STRINGIFY(VULKAN_HPP_NAMESPACE) namespace VULKAN_HPP_NAMESPACE { @@ -4888,7 +4888,7 @@ int main( int argc, char **argv ) assert(!registryElement->NextSiblingElement()); std::vector children = getChildElements(registryElement); - checkElements(children, { "commands", "comment", "enums", "extensions", "feature", "tags", "types", "vendorids" }); + checkElements(children, { "commands", "comment", "enums", "extensions", "feature", "tags", "types", "vendorids", "platforms" }); for (auto child : children) { const std::string value = child->Value(); @@ -4921,13 +4921,22 @@ int main( int argc, char **argv ) { generator.readTypes(child); } - else + else if (value == "vendorids") { - assert(value == "vendorids"); #if !defined(NDEBUG) generator.skipVendorIDs(child); #endif } + else if (value == "platforms") + { + // skip this tag + } + else + { + std::stringstream lineNumber; + lineNumber << child->GetLineNum(); + throw std::runtime_error(std::string("unknown tag ") + value + " at line number:" + lineNumber.str()); + } } generator.sortDependencies();