mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-10-14 16:32:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Accept multiple XML <formats> tags. (#1814)

Browse Source
This commit is contained in:
Andreas Süßenbach 2024-02-26 15:38:33 +01:00 committed by GitHub
parent 29723f90a1
commit 789c215e74
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
VulkanHppGenerator.cpp
View File

@ -13565,16 +13565,17 @@ void VulkanHppGenerator::readFormat( tinyxml2::XMLElement const * element )
{ {
const int line = element->GetLineNum(); const int line = element->GetLineNum();
std::map<std::string, std::string> attributes = getAttributes( element ); std::map<std::string, std::string> attributes = getAttributes( element );
checkAttributes( line, checkAttributes(
attributes, line,
{ { "blockSize", { "1", "2", "3", "4", "5", "6", "8", "12", "16", "24", "32" } }, attributes,
{ "class", {} }, { { "blockSize", { "1", "2", "3", "4", "5", "6", "8", "12", "16", "24", "27", "32", "36", "48", "64", "80", "100", "125", "150", "180", "216" } },
{ "name", {} }, { "class", {} },
{ "texelsPerBlock", { "1", "16", "20", "25", "30", "36", "40", "48", "50", "60", "64", "80", "100", "120", "144" } } }, { "name", {} },
{ { "blockExtent", { "1", "2", "4", "5", "6", "8", "10", "12" } }, { "texelsPerBlock", { "1", "16", "20", "25", "27", "30", "36", "40", "48", "50", "60", "64", "80", "100", "120", "125", "144", "150", "180", "216" } } },
{ "chroma", { "420", "422", "444" } }, { { "blockExtent", { "1", "2", "3", "4", "5", "6", "8", "10", "12" } },
{ "compressed", { "ASTC HDR", "ASTC LDR", "BC", "EAC", "ETC", "ETC2", "PVRTC" } }, { "chroma", { "420", "422", "444" } },
{ "packed", { "8", "16", "32" } } } ); { "compressed", { "ASTC HDR", "ASTC LDR", "BC", "EAC", "ETC", "ETC2", "PVRTC" } },
{ "packed", { "8", "16", "32" } } } );
std::vector<tinyxml2::XMLElement const *> children = getChildElements( element ); std::vector<tinyxml2::XMLElement const *> children = getChildElements( element );
checkElements( line, children, { { "component", false } }, { "plane", "spirvimageformat" } ); checkElements( line, children, { { "component", false } }, { "plane", "spirvimageformat" } );
@ -13752,7 +13753,7 @@ void VulkanHppGenerator::readFormatPlane( tinyxml2::XMLElement const * element,
void VulkanHppGenerator::readFormats( tinyxml2::XMLElement const * element ) void VulkanHppGenerator::readFormats( tinyxml2::XMLElement const * element )
{ {
const int line = element->GetLineNum(); const int line = element->GetLineNum();
checkAttributes( line, getAttributes( element ), {}, {} ); checkAttributes( line, getAttributes( element ), {}, { { "comment", {} } } );
std::vector<tinyxml2::XMLElement const *> children = getChildElements( element ); std::vector<tinyxml2::XMLElement const *> children = getChildElements( element );
checkElements( line, children, { { "format", false } } ); checkElements( line, children, { { "format", false } } );
@ -13878,7 +13879,7 @@ void VulkanHppGenerator::readRegistry( tinyxml2::XMLElement const * element )
{ "enums", false }, { "enums", false },
{ "extensions", true }, { "extensions", true },
{ "feature", false }, { "feature", false },
{ "formats", true }, { "formats", false },
{ "platforms", true }, { "platforms", true },
{ "spirvcapabilities", true }, { "spirvcapabilities", true },
{ "spirvextensions", true }, { "spirvextensions", true },

2
XMLHelper.hpp
View File

@ -209,7 +209,7 @@ inline void checkElements( int lin
// check: r.second (means: required excactly once) => (encouteredIt->second == 1) // check: r.second (means: required excactly once) => (encouteredIt->second == 1)
checkForError( !r.second || ( encounteredIt->second == 1 ), checkForError( !r.second || ( encounteredIt->second == 1 ),
line, line,
"required element <" + r.first + "> is supposed to be listed exactly once, but is listed " + std::to_string( encounteredIt->second ) ); "required element <" + r.first + "> is supposed to be listed exactly once, but is listed " + std::to_string( encounteredIt->second ) + " times" );
} }
} }