From 6a11b182e1adec5d4409d77905e04074726d67c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Tue, 6 Aug 2024 09:22:31 +0200 Subject: [PATCH] Extend support of video format properties (no code generated) (#1937) --- VulkanHppGenerator.cpp | 132 ++++++++++++++++++++++++++++++----------- VulkanHppGenerator.hpp | 4 +- 2 files changed, 99 insertions(+), 37 deletions(-) diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index c4ee34d2c..4cf014db9 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -5785,7 +5785,7 @@ std::string VulkanHppGenerator::generateCppModuleUsings() const const auto [enterNoSmartHandle, leaveNoSmartHandle] = generateProtection( "VULKAN_HPP_NO_SMART_HANDLE", false ); usings += "\n" + enterNoSmartHandle + noSmartHandleUsings + leaveNoSmartHandle + "\n"; - for ( auto const& functionName : hardCodedFunctions ) + for ( auto const & functionName : hardCodedFunctions ) { usings += "\n" + replaceWithMap( usingTemplate, { { "className", std::string{ functionName } } } ); } @@ -5863,8 +5863,7 @@ std::string VulkanHppGenerator::generateCppModuleUsings() const usings += exceptionsLeave + "\n"; // some hardcoded types - auto const hardCodedResultValueTypes = - std::array{ "ResultValue", "ResultValueType" }; + auto const hardCodedResultValueTypes = std::array{ "ResultValue", "ResultValueType" }; for ( auto const & valueType : hardCodedResultValueTypes ) { usings += replaceWithMap( usingTemplate, { { "className", valueType } } ); @@ -9991,8 +9990,7 @@ std::tupleValue(); @@ -15719,10 +15717,12 @@ void VulkanHppGenerator::readVideoCapabilities( tinyxml2::XMLElement const * ele checkAttributes( line, attributes, { { "struct", {} } }, {} ); checkElements( line, getChildElements( element ), {} ); - videoCodec.capabilities = attributes.find( "struct" )->second; - checkForError( m_structs.contains( videoCodec.capabilities ), + std::string capabilities = attributes.find( "struct" )->second; + checkForError( std::find( videoCodec.capabilities.begin(), videoCodec.capabilities.end(), capabilities ) == videoCodec.capabilities.end(), line, - "videocodec <" + videoCodec.name + "> lists unknown capabilities struct <" + videoCodec.capabilities + ">" ); + "videocapabilities struct <" + capabilities + "> already listed for videoCodec <" + videoCodec.name + ">" ); + checkForError( m_structs.contains( capabilities ), line, "videocodec <" + videoCodec.name + "> lists unknown capabilities struct <" + capabilities + ">" ); + videoCodec.capabilities.push_back( capabilities ); } void VulkanHppGenerator::readVideoCodec( tinyxml2::XMLElement const * element ) @@ -15732,7 +15732,7 @@ void VulkanHppGenerator::readVideoCodec( tinyxml2::XMLElement const * element ) checkAttributes( line, attributes, { { "name", {} } }, { { "extend", {} }, { "value", {} } } ); std::vector children = getChildElements( element ); - checkElements( line, children, { { "videocapabilities", true } }, { "videoformat", "videoprofiles" } ); + checkElements( line, children, { { "videocapabilities", false } }, { "videoformat", "videoprofiles" } ); VideoCodec videoCodec; videoCodec.xmlLine = line; @@ -15804,43 +15804,83 @@ void VulkanHppGenerator::readVideoFormat( tinyxml2::XMLElement const * element, { const int line = element->GetLineNum(); std::map attributes = getAttributes( element ); - checkAttributes( line, attributes, { { "name", {} }, { "usage", {} } }, {} ); - std::vector children = getChildElements( element ); - checkElements( line, children, {}, { "videorequirecapabilities" } ); + if ( attributes.contains( "extend" ) ) + { + checkAttributes( line, attributes, { { "extend", {} } }, {} ); - auto flagBitsIt = m_enums.find( "VkImageUsageFlagBits" ); - assert( flagBitsIt != m_enums.end() ); + std::vector children = getChildElements( element ); + checkElements( line, children, { { "videoformatproperties", true } } ); - VideoFormat format; - format.xmlLine = line; - for ( auto const & attribute : attributes ) - { - if ( attribute.first == "name" ) + std::string extend = attributes.find( "extend" )->second; + + std::vector::iterator videoFormatIt; + + auto videoCodecIt = std::find_if( m_videoCodecs.begin(), + m_videoCodecs.end(), + [&extend, &videoFormatIt]( auto & vc ) + { + videoFormatIt = + std::find_if( vc.formats.begin(), vc.formats.end(), [&extend]( auto & vf ) { return vf.name == extend; } ); + return videoFormatIt != vc.formats.end(); + } ); + checkForError( videoCodecIt != m_videoCodecs.end(), line, "videocodec <" + videoCodec.name + "> extends unknown videoformat <" + extend + ">" ); + + for ( auto child : children ) { - format.name = attribute.second; - checkForError( findByName( videoCodec.formats, format.name ) == videoCodec.formats.end(), - line, - "Video Format <" + format.name + "> has already been listed for Video Codec <" + videoCodec.name + ">" ); + std::string value = child->Value(); + if ( value == "videoformatproperties" ) + { + readVideoFormatProperties( child, videoCodecIt->name, *videoFormatIt ); + } } - else if ( attribute.first == "usage" ) + } + else + { + checkAttributes( line, attributes, { { "name", {} }, { "usage", {} } }, {} ); + + std::vector children = getChildElements( element ); + checkElements( line, children, {}, { "videoformatproperties", "videorequirecapabilities" } ); + + auto flagBitsIt = m_enums.find( "VkImageUsageFlagBits" ); + assert( flagBitsIt != m_enums.end() ); + + VideoFormat format; + format.xmlLine = line; + for ( auto const & attribute : attributes ) { - format.usage = tokenize( attribute.second, "+" ); - for ( auto const & usage : format.usage ) + if ( attribute.first == "name" ) { - checkForError( findByName( flagBitsIt->second.values, usage ) != flagBitsIt->second.values.end(), + format.name = attribute.second; + checkForError( findByName( videoCodec.formats, format.name ) == videoCodec.formats.end(), line, - "Unknown Video Format <" + format.name + "> listed for Video Codec <" + videoCodec.name + ">" ); + "Video Format <" + format.name + "> has already been listed for Video Codec <" + videoCodec.name + ">" ); + } + else if ( attribute.first == "usage" ) + { + format.usage = tokenize( attribute.second, "+" ); + for ( auto const & usage : format.usage ) + { + checkForError( findByName( flagBitsIt->second.values, usage ) != flagBitsIt->second.values.end(), + line, + "Unknown Video Format <" + format.name + "> listed for Video Codec <" + videoCodec.name + ">" ); + } } } - } - videoCodec.formats.push_back( format ); + videoCodec.formats.push_back( format ); - for ( auto child : children ) - { - std::string value = child->Value(); - assert( value == "videorequirecapabilities" ); - readVideoRequireCapabilities( child, videoCodec ); + for ( auto child : children ) + { + std::string value = child->Value(); + if ( value == "videoformatproperties" ) + { + readVideoFormatProperties( child, videoCodec.name, videoCodec.formats.back() ); + } + else if ( value == "videorequirecapabilities" ) + { + readVideoRequireCapabilities( child, videoCodec ); + } + } } } @@ -15932,6 +15972,26 @@ void VulkanHppGenerator::readVideoProfiles( tinyxml2::XMLElement const * element } } +void VulkanHppGenerator::readVideoFormatProperties( tinyxml2::XMLElement const * element, std::string const & videoCodec, VideoFormat & videoFormat ) +{ + const int line = element->GetLineNum(); + std::map attributes = getAttributes( element ); + checkAttributes( line, attributes, { { "struct", {} } }, {} ); + checkElements( line, getChildElements( element ), {} ); + + std::string formatProperties = attributes.find( "struct" )->second; + + checkForError( m_structs.find( formatProperties ) != m_structs.end(), + line, + "videoCodec <" + videoCodec + "> lists unknown struct <" + formatProperties + "> as videoformatproperties" ); + checkForError( std::find( videoFormat.formatProperties.begin(), videoFormat.formatProperties.end(), formatProperties ) == videoFormat.formatProperties.end(), + line, + "videoformatproperties <" + formatProperties + "> listed in videocodec <" + videoCodec + "> already listed for videoformat <" + + videoFormat.name + ">" ); + + videoFormat.formatProperties.push_back( formatProperties ); +} + void VulkanHppGenerator::readVideoRequireCapabilities( tinyxml2::XMLElement const * element, VideoCodec & videoCodec ) { const int line = element->GetLineNum(); diff --git a/VulkanHppGenerator.hpp b/VulkanHppGenerator.hpp index fb5c1303a..63dd0c4c4 100644 --- a/VulkanHppGenerator.hpp +++ b/VulkanHppGenerator.hpp @@ -398,6 +398,7 @@ class VulkanHppGenerator struct VideoFormat { int xmlLine = {}; + std::vector formatProperties; std::string name; std::vector usage; std::vector requireCapabilities; @@ -428,7 +429,7 @@ class VulkanHppGenerator { int xmlLine = {}; std::string name; - std::string capabilities; + std::vector capabilities; std::string extend; std::string value; std::vector formats; @@ -1090,6 +1091,7 @@ class VulkanHppGenerator void readVideoProfileMember( tinyxml2::XMLElement const * element, VideoCodec & videoCodec ); void readVideoProfile( tinyxml2::XMLElement const * element, VideoCodec & videoCodec ); void readVideoProfiles( tinyxml2::XMLElement const * element, VideoCodec & videoCodec ); + void readVideoFormatProperties( tinyxml2::XMLElement const * element, std::string const & videoCodec, VideoFormat & videoFormat ); void readVideoRequireCapabilities( tinyxml2::XMLElement const * element, VideoCodec & videoCodec ); void registerDeleter( std::string const & commandName, CommandData const & commandData ); void rescheduleRAIIHandle( std::string & str,