From 95c622a64f52ad750ae372a900f179971be88d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Mon, 24 Apr 2023 18:06:06 +0200 Subject: [PATCH] Extend support of some special type of functions. (#1567) --- VulkanHppGenerator.cpp | 50 ++++++++++++++++----------------- vulkan/vulkan.hpp | 2 +- vulkan/vulkan_funcs.hpp | 48 ++++++++++++++++---------------- vulkan/vulkan_raii.hpp | 32 ++++++++++----------- vulkan/vulkansc.hpp | 2 +- vulkan/vulkansc_funcs.hpp | 58 +++++++++++++++++++-------------------- vulkan/vulkansc_raii.hpp | 32 ++++++++++----------- 7 files changed, 112 insertions(+), 112 deletions(-) diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index c9b62f1..d382cff 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -3649,12 +3649,13 @@ std::string VulkanHppGenerator::generateCommandResultMultiSuccessWithErrors3Retu switch ( vectorParams.size() ) { case 1: - if ( commandData.params[returnParams[0]].type.type == "VkBool32" ) + if ( ( commandData.params[returnParams[0]].type.type != "void" ) && !isHandleType( commandData.params[returnParams[0]].type.type ) && + !isStructureChainAnchor( commandData.params[returnParams[0]].type.type ) ) { - if ( commandData.params[returnParams[1]].type.type == "uint32_t" ) + if ( ( commandData.params[returnParams[1]].type.type == "size_t" ) || ( commandData.params[returnParams[1]].type.type == "uint32_t" ) ) { - if ( ( commandData.params[returnParams[2]].type.type != "void" ) && !isHandleType( commandData.params[returnParams[2]].type.type ) && - !isStructureChainAnchor( commandData.params[returnParams[2]].type.type ) ) + if ( ( commandData.params[returnParams[2]].type.type == "void" ) || + ( !isHandleType( commandData.params[returnParams[2]].type.type ) && !isStructureChainAnchor( commandData.params[returnParams[2]].type.type ) ) ) { if ( returnParams[1] == vectorParams.begin()->second.lenParam ) { @@ -4616,8 +4617,7 @@ std::string VulkanHppGenerator::generateDataDeclarations( CommandData const & assert( !( flavourFlags & CommandFlavourFlagBits::unique ) ); return generateDataDeclarations2Returns( commandData, returnParams, vectorParams, flavourFlags, raii, dataTypes, dataType, returnVariable ); case 3: - assert( templatedParams.empty() && - !( flavourFlags & ( CommandFlavourFlagBits::chained | CommandFlavourFlagBits::singular | CommandFlavourFlagBits::unique ) ) ); + assert( !( flavourFlags & ( CommandFlavourFlagBits::chained | CommandFlavourFlagBits::singular | CommandFlavourFlagBits::unique ) ) ); return generateDataDeclarations3Returns( commandData, returnParams, vectorParams, flavourFlags, raii, dataTypes ); default: assert( false ); return ""; } @@ -4695,9 +4695,9 @@ std::string VulkanHppGenerator::generateDataDeclarations2Returns( CommandData co std::string firstDataVariable = startLowerCase( stripPrefix( commandData.params[returnParams[0]].name, "p" ) ); std::string secondDataVariable = startLowerCase( stripPrefix( commandData.params[returnParams[1]].name, "p" ) ); - std::string const dataDeclarationTemplate = R"(std::pair<${firstDataType},${secondDataType}> data; - ${firstDataType} & ${firstDataVariable} = data.first; - ${secondDataType} & ${secondDataVariable} = data.second;)"; + std::string const dataDeclarationTemplate = R"(std::pair<${firstDataType},${secondDataType}> data_; + ${firstDataType} & ${firstDataVariable} = data_.first; + ${secondDataType} & ${secondDataVariable} = data_.second;)"; return replaceWithMap( dataDeclarationTemplate, { { "firstDataType", dataTypes[0] }, @@ -4755,9 +4755,9 @@ std::string VulkanHppGenerator::generateDataDeclarations2Returns( CommandData co { firstDataVariable = stripPluralS( firstDataVariable ); - std::string const dataDeclarationTemplate = R"(std::pair<${firstDataType},${secondDataType}> data; - ${firstDataType} & ${firstDataVariable} = data.first; - ${secondDataType} & ${secondDataVariable} = data.second;)"; + std::string const dataDeclarationTemplate = R"(std::pair<${firstDataType},${secondDataType}> data_; + ${firstDataType} & ${firstDataVariable} = data_.first; + ${secondDataType} & ${secondDataVariable} = data_.second;)"; return replaceWithMap( dataDeclarationTemplate, { { "firstDataType", dataTypes[0] }, @@ -4776,9 +4776,9 @@ std::string VulkanHppGenerator::generateDataDeclarations2Returns( CommandData co std::string vectorSize = startLowerCase( stripPrefix( commandData.params[vectorParams.begin()->first].name, "p" ) ) + ".size()"; std::string const dataDeclarationTemplate = - R"(std::pair,${secondDataType}> data( std::piecewise_construct, std::forward_as_tuple( ${vectorSize}${allocateInitializer} ), std::forward_as_tuple( 0 ) ); - std::vector<${firstDataType}${allocatorType}> & ${firstDataVariable} = data.first; - ${secondDataType} & ${secondDataVariable} = data.second;)"; + R"(std::pair,${secondDataType}> data_( std::piecewise_construct, std::forward_as_tuple( ${vectorSize}${allocateInitializer} ), std::forward_as_tuple( 0 ) ); + std::vector<${firstDataType}${allocatorType}> & ${firstDataVariable} = data_.first; + ${secondDataType} & ${secondDataVariable} = data_.second;)"; return replaceWithMap( dataDeclarationTemplate, { { "allocateInitializer", allocateInitializer }, @@ -4817,15 +4817,15 @@ std::string VulkanHppGenerator::generateDataDeclarations3Returns( CommandData co vectorAllocatorType = startUpperCase( stripPrefix( dataTypes[2], "VULKAN_HPP_NAMESPACE::" ) ) + "Allocator"; pairConstructor = ( flavourFlags & CommandFlavourFlagBits::withAllocator ) - ? ( "( std::piecewise_construct, std::forward_as_tuple( false ), std::forward_as_tuple( " + startLowerCase( vectorAllocatorType ) + " ) )" ) + ? ( "( std::piecewise_construct, std::forward_as_tuple(), std::forward_as_tuple( " + startLowerCase( vectorAllocatorType ) + " ) )" ) : ""; vectorAllocatorType = ", " + vectorAllocatorType; } std::string const dataDeclarationsTemplate = - R"(std::pair<${valueType},std::vector<${vectorElementType}${vectorAllocatorType}>> data${pairConstructor}; - ${valueType} & ${valueVariable} = data.first; - std::vector<${vectorElementType}${vectorAllocatorType}> & ${vectorVariable} = data.second; + R"(std::pair<${valueType},std::vector<${vectorElementType}${vectorAllocatorType}>> data_${pairConstructor}; + ${valueType} & ${valueVariable} = data_.first; + std::vector<${vectorElementType}${vectorAllocatorType}> & ${vectorVariable} = data_.second; ${counterType} ${counterVariable};)"; return replaceWithMap( dataDeclarationsTemplate, @@ -4861,9 +4861,9 @@ std::string VulkanHppGenerator::generateDataDeclarations3Returns( CommandData co } std::string const dataDeclarationsTemplate = - R"(std::pair, std::vector<${secondVectorElementType}${secondVectorAllocatorType}>> data${pairConstructor}; - std::vector<${firstVectorElementType}${firstVectorAllocatorType}> & ${firstVectorVariable} = data.first; - std::vector<${secondVectorElementType}${secondVectorAllocatorType}> & ${secondVectorVariable} = data.second; + R"(std::pair, std::vector<${secondVectorElementType}${secondVectorAllocatorType}>> data_${pairConstructor}; + std::vector<${firstVectorElementType}${firstVectorAllocatorType}> & ${firstVectorVariable} = data_.first; + std::vector<${secondVectorElementType}${secondVectorAllocatorType}> & ${secondVectorVariable} = data_.second; ${counterType} ${counterVariable};)"; return replaceWithMap( dataDeclarationsTemplate, @@ -9124,8 +9124,8 @@ std::string VulkanHppGenerator::generateReturnVariable( CommandData const & { auto vectorParamIt = vectorParams.find( returnParams[1] ); if ( vectorParamIt == vectorParams.end() ) - { // the return variable is simply named "data", and holds the multi-return value stuff - returnVariable = "data"; + { // the return variable is simply named "data_", and holds the multi-return value stuff + returnVariable = "data_"; } else { @@ -9142,7 +9142,7 @@ std::string VulkanHppGenerator::generateReturnVariable( CommandData const & ( ( vectorParams.size() == 2 ) && ( vectorParams.begin()->first == returnParams[1] ) && ( vectorParams.begin()->second.lenParam == returnParams[0] ) && ( std::next( vectorParams.begin() )->first == returnParams[2] ) && ( std::next( vectorParams.begin() )->second.lenParam == returnParams[0] ) ) ); - returnVariable = "data"; + returnVariable = "data_"; break; } return returnVariable; diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index 6422c96..65b9ed8 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -13264,7 +13264,7 @@ namespace VULKAN_HPP_NAMESPACE # elif defined( __APPLE__ ) m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL ); # elif defined( _WIN32 ) - m_library = ::LoadLibraryA( "vulkan-1.dll" ); + m_library = ::LoadLibraryA( "vulkan-1.dll" ); # else # error unsupported platform # endif diff --git a/vulkan/vulkan_funcs.hpp b/vulkan/vulkan_funcs.hpp index 3dccc24..15ab429 100644 --- a/vulkan/vulkan_funcs.hpp +++ b/vulkan/vulkan_funcs.hpp @@ -12501,9 +12501,9 @@ namespace VULKAN_HPP_NAMESPACE std::pair, std::vector> - data; - std::vector & counters = data.first; - std::vector & counterDescriptions = data.second; + data_; + std::vector & counters = data_.first; + std::vector & counterDescriptions = data_.second; uint32_t counterCount; VkResult result; do @@ -12529,7 +12529,7 @@ namespace VULKAN_HPP_NAMESPACE counters.resize( counterCount ); counterDescriptions.resize( counterCount ); } - return createResultValueType( static_cast( result ), data ); + return createResultValueType( static_cast( result ), data_ ); } template , std::vector> - data( + data_( std::piecewise_construct, std::forward_as_tuple( performanceCounterKHRAllocator ), std::forward_as_tuple( performanceCounterDescriptionKHRAllocator ) ); - std::vector & counters = data.first; - std::vector & counterDescriptions = data.second; + std::vector & counters = data_.first; + std::vector & counterDescriptions = data_.second; uint32_t counterCount; VkResult result; do @@ -12581,7 +12581,7 @@ namespace VULKAN_HPP_NAMESPACE counters.resize( counterCount ); counterDescriptions.resize( counterCount ); } - return createResultValueType( static_cast( result ), data ); + return createResultValueType( static_cast( result ), data_ ); } #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */ @@ -16068,15 +16068,15 @@ namespace VULKAN_HPP_NAMESPACE { VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION ); - std::pair, uint64_t> data( + std::pair, uint64_t> data_( std::piecewise_construct, std::forward_as_tuple( timestampInfos.size() ), std::forward_as_tuple( 0 ) ); - std::vector & timestamps = data.first; - uint64_t & maxDeviation = data.second; + std::vector & timestamps = data_.first; + uint64_t & maxDeviation = data_.second; VkResult result = d.vkGetCalibratedTimestampsEXT( m_device, timestampInfos.size(), reinterpret_cast( timestampInfos.data() ), timestamps.data(), &maxDeviation ); resultCheck( static_cast( result ), VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsEXT" ); - return createResultValueType( static_cast( result ), data ); + return createResultValueType( static_cast( result ), data_ ); } template , uint64_t> data( + std::pair, uint64_t> data_( std::piecewise_construct, std::forward_as_tuple( timestampInfos.size(), uint64_tAllocator ), std::forward_as_tuple( 0 ) ); - std::vector & timestamps = data.first; - uint64_t & maxDeviation = data.second; + std::vector & timestamps = data_.first; + uint64_t & maxDeviation = data_.second; VkResult result = d.vkGetCalibratedTimestampsEXT( m_device, timestampInfos.size(), reinterpret_cast( timestampInfos.data() ), timestamps.data(), &maxDeviation ); resultCheck( static_cast( result ), VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsEXT" ); - return createResultValueType( static_cast( result ), data ); + return createResultValueType( static_cast( result ), data_ ); } template @@ -16107,14 +16107,14 @@ namespace VULKAN_HPP_NAMESPACE { VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION ); - std::pair data; - uint64_t & timestamp = data.first; - uint64_t & maxDeviation = data.second; + std::pair data_; + uint64_t & timestamp = data_.first; + uint64_t & maxDeviation = data_.second; VkResult result = d.vkGetCalibratedTimestampsEXT( m_device, 1, reinterpret_cast( ×tampInfo ), ×tamp, &maxDeviation ); resultCheck( static_cast( result ), VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampEXT" ); - return createResultValueType( static_cast( result ), data ); + return createResultValueType( static_cast( result ), data_ ); } #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */ @@ -19244,9 +19244,9 @@ namespace VULKAN_HPP_NAMESPACE { VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION ); - std::pair data; - VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT & faultCounts = data.first; - VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT & faultInfo = data.second; + std::pair data_; + VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT & faultCounts = data_.first; + VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT & faultInfo = data_.second; VkResult result = d.vkGetDeviceFaultInfoEXT( m_device, reinterpret_cast( &faultCounts ), reinterpret_cast( &faultInfo ) ); resultCheck( static_cast( result ), @@ -19254,7 +19254,7 @@ namespace VULKAN_HPP_NAMESPACE { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eIncomplete } ); return ResultValue>( - static_cast( result ), data ); + static_cast( result ), data_ ); } #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */ diff --git a/vulkan/vulkan_raii.hpp b/vulkan/vulkan_raii.hpp index 1d608c4..eb62cba 100644 --- a/vulkan/vulkan_raii.hpp +++ b/vulkan/vulkan_raii.hpp @@ -15905,9 +15905,9 @@ namespace VULKAN_HPP_NAMESPACE VULKAN_HPP_ASSERT( getDispatcher()->vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR && "Function requires " ); - std::pair, std::vector> data; - std::vector & counters = data.first; - std::vector & counterDescriptions = data.second; + std::pair, std::vector> data_; + std::vector & counters = data_.first; + std::vector & counterDescriptions = data_.second; uint32_t counterCount; VkResult result; do @@ -15934,7 +15934,7 @@ namespace VULKAN_HPP_NAMESPACE counters.resize( counterCount ); counterDescriptions.resize( counterCount ); } - return data; + return data_; } VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint32_t PhysicalDevice::getQueueFamilyPerformanceQueryPassesKHR( @@ -17399,9 +17399,9 @@ namespace VULKAN_HPP_NAMESPACE { VULKAN_HPP_ASSERT( getDispatcher()->vkGetCalibratedTimestampsEXT && "Function requires " ); - std::pair, uint64_t> data( std::piecewise_construct, std::forward_as_tuple( timestampInfos.size() ), std::forward_as_tuple( 0 ) ); - std::vector & timestamps = data.first; - uint64_t & maxDeviation = data.second; + std::pair, uint64_t> data_( std::piecewise_construct, std::forward_as_tuple( timestampInfos.size() ), std::forward_as_tuple( 0 ) ); + std::vector & timestamps = data_.first; + uint64_t & maxDeviation = data_.second; VkResult result = getDispatcher()->vkGetCalibratedTimestampsEXT( static_cast( m_device ), timestampInfos.size(), reinterpret_cast( timestampInfos.data() ), @@ -17409,7 +17409,7 @@ namespace VULKAN_HPP_NAMESPACE &maxDeviation ); resultCheck( static_cast( result ), VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsEXT" ); - return data; + return data_; } VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair @@ -17417,14 +17417,14 @@ namespace VULKAN_HPP_NAMESPACE { VULKAN_HPP_ASSERT( getDispatcher()->vkGetCalibratedTimestampsEXT && "Function requires " ); - std::pair data; - uint64_t & timestamp = data.first; - uint64_t & maxDeviation = data.second; + std::pair data_; + uint64_t & timestamp = data_.first; + uint64_t & maxDeviation = data_.second; VkResult result = getDispatcher()->vkGetCalibratedTimestampsEXT( static_cast( m_device ), 1, reinterpret_cast( ×tampInfo ), ×tamp, &maxDeviation ); resultCheck( static_cast( result ), VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampEXT" ); - return data; + return data_; } //=== VK_NV_mesh_shader === @@ -18857,16 +18857,16 @@ namespace VULKAN_HPP_NAMESPACE { VULKAN_HPP_ASSERT( getDispatcher()->vkGetDeviceFaultInfoEXT && "Function requires " ); - std::pair data; - VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT & faultCounts = data.first; - VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT & faultInfo = data.second; + std::pair data_; + VULKAN_HPP_NAMESPACE::DeviceFaultCountsEXT & faultCounts = data_.first; + VULKAN_HPP_NAMESPACE::DeviceFaultInfoEXT & faultInfo = data_.second; VkResult result = getDispatcher()->vkGetDeviceFaultInfoEXT( static_cast( m_device ), reinterpret_cast( &faultCounts ), reinterpret_cast( &faultInfo ) ); resultCheck( static_cast( result ), VULKAN_HPP_NAMESPACE_STRING "::Device::getFaultInfoEXT", { VULKAN_HPP_NAMESPACE::Result::eSuccess, VULKAN_HPP_NAMESPACE::Result::eIncomplete } ); - return std::make_pair( static_cast( result ), data ); + return std::make_pair( static_cast( result ), data_ ); } # if defined( VK_USE_PLATFORM_WIN32_KHR ) diff --git a/vulkan/vulkansc.hpp b/vulkan/vulkansc.hpp index 3ba35e6..d34b9c8 100644 --- a/vulkan/vulkansc.hpp +++ b/vulkan/vulkansc.hpp @@ -6772,7 +6772,7 @@ namespace VULKAN_HPP_NAMESPACE # elif defined( __APPLE__ ) m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL ); # elif defined( _WIN32 ) - m_library = ::LoadLibraryA( "vulkan-1.dll" ); + m_library = ::LoadLibraryA( "vulkan-1.dll" ); # else # error unsupported platform # endif diff --git a/vulkan/vulkansc_funcs.hpp b/vulkan/vulkansc_funcs.hpp index eb30e82..28b1f3c 100644 --- a/vulkan/vulkansc_funcs.hpp +++ b/vulkan/vulkansc_funcs.hpp @@ -6605,9 +6605,9 @@ namespace VULKAN_HPP_NAMESPACE { VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION ); - std::pair> data; - VULKAN_HPP_NAMESPACE::Bool32 & unrecordedFaults = data.first; - std::vector & faults = data.second; + std::pair> data_; + VULKAN_HPP_NAMESPACE::Bool32 & unrecordedFaults = data_.first; + std::vector & faults = data_.second; uint32_t faultCount; VkResult result; do @@ -6626,7 +6626,7 @@ namespace VULKAN_HPP_NAMESPACE } while ( result == VK_INCOMPLETE ); resultCheck( static_cast( result ), VULKAN_HPP_NAMESPACE_STRING "::Device::getFaultData" ); - return createResultValueType( static_cast( result ), data ); + return createResultValueType( static_cast( result ), data_ ); } template > data( - std::piecewise_construct, std::forward_as_tuple( false ), std::forward_as_tuple( faultDataAllocator ) ); - VULKAN_HPP_NAMESPACE::Bool32 & unrecordedFaults = data.first; - std::vector & faults = data.second; + std::pair> data_( + std::piecewise_construct, std::forward_as_tuple(), std::forward_as_tuple( faultDataAllocator ) ); + VULKAN_HPP_NAMESPACE::Bool32 & unrecordedFaults = data_.first; + std::vector & faults = data_.second; uint32_t faultCount; VkResult result; do @@ -6661,7 +6661,7 @@ namespace VULKAN_HPP_NAMESPACE } while ( result == VK_INCOMPLETE ); resultCheck( static_cast( result ), VULKAN_HPP_NAMESPACE_STRING "::Device::getFaultData" ); - return createResultValueType( static_cast( result ), data ); + return createResultValueType( static_cast( result ), data_ ); } #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */ @@ -8358,9 +8358,9 @@ namespace VULKAN_HPP_NAMESPACE std::pair, std::vector> - data; - std::vector & counters = data.first; - std::vector & counterDescriptions = data.second; + data_; + std::vector & counters = data_.first; + std::vector & counterDescriptions = data_.second; uint32_t counterCount; VkResult result; do @@ -8386,7 +8386,7 @@ namespace VULKAN_HPP_NAMESPACE counters.resize( counterCount ); counterDescriptions.resize( counterCount ); } - return createResultValueType( static_cast( result ), data ); + return createResultValueType( static_cast( result ), data_ ); } template , std::vector> - data( + data_( std::piecewise_construct, std::forward_as_tuple( performanceCounterKHRAllocator ), std::forward_as_tuple( performanceCounterDescriptionKHRAllocator ) ); - std::vector & counters = data.first; - std::vector & counterDescriptions = data.second; + std::vector & counters = data_.first; + std::vector & counterDescriptions = data_.second; uint32_t counterCount; VkResult result; do @@ -8438,7 +8438,7 @@ namespace VULKAN_HPP_NAMESPACE counters.resize( counterCount ); counterDescriptions.resize( counterCount ); } - return createResultValueType( static_cast( result ), data ); + return createResultValueType( static_cast( result ), data_ ); } #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */ @@ -9442,15 +9442,15 @@ namespace VULKAN_HPP_NAMESPACE { VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION ); - std::pair, uint64_t> data( + std::pair, uint64_t> data_( std::piecewise_construct, std::forward_as_tuple( timestampInfos.size() ), std::forward_as_tuple( 0 ) ); - std::vector & timestamps = data.first; - uint64_t & maxDeviation = data.second; + std::vector & timestamps = data_.first; + uint64_t & maxDeviation = data_.second; VkResult result = d.vkGetCalibratedTimestampsEXT( m_device, timestampInfos.size(), reinterpret_cast( timestampInfos.data() ), timestamps.data(), &maxDeviation ); resultCheck( static_cast( result ), VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsEXT" ); - return createResultValueType( static_cast( result ), data ); + return createResultValueType( static_cast( result ), data_ ); } template , uint64_t> data( + std::pair, uint64_t> data_( std::piecewise_construct, std::forward_as_tuple( timestampInfos.size(), uint64_tAllocator ), std::forward_as_tuple( 0 ) ); - std::vector & timestamps = data.first; - uint64_t & maxDeviation = data.second; + std::vector & timestamps = data_.first; + uint64_t & maxDeviation = data_.second; VkResult result = d.vkGetCalibratedTimestampsEXT( m_device, timestampInfos.size(), reinterpret_cast( timestampInfos.data() ), timestamps.data(), &maxDeviation ); resultCheck( static_cast( result ), VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsEXT" ); - return createResultValueType( static_cast( result ), data ); + return createResultValueType( static_cast( result ), data_ ); } template @@ -9481,14 +9481,14 @@ namespace VULKAN_HPP_NAMESPACE { VULKAN_HPP_ASSERT( d.getVkHeaderVersion() == VK_HEADER_VERSION ); - std::pair data; - uint64_t & timestamp = data.first; - uint64_t & maxDeviation = data.second; + std::pair data_; + uint64_t & timestamp = data_.first; + uint64_t & maxDeviation = data_.second; VkResult result = d.vkGetCalibratedTimestampsEXT( m_device, 1, reinterpret_cast( ×tampInfo ), ×tamp, &maxDeviation ); resultCheck( static_cast( result ), VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampEXT" ); - return createResultValueType( static_cast( result ), data ); + return createResultValueType( static_cast( result ), data_ ); } #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */ diff --git a/vulkan/vulkansc_raii.hpp b/vulkan/vulkansc_raii.hpp index 65de6fe..1807872 100644 --- a/vulkan/vulkansc_raii.hpp +++ b/vulkan/vulkansc_raii.hpp @@ -8764,9 +8764,9 @@ namespace VULKAN_HPP_NAMESPACE { VULKAN_HPP_ASSERT( getDispatcher()->vkGetFaultData && "Function requires " ); - std::pair> data; - VULKAN_HPP_NAMESPACE::Bool32 & unrecordedFaults = data.first; - std::vector & faults = data.second; + std::pair> data_; + VULKAN_HPP_NAMESPACE::Bool32 & unrecordedFaults = data_.first; + std::vector & faults = data_.second; uint32_t faultCount; VkResult result; do @@ -8788,7 +8788,7 @@ namespace VULKAN_HPP_NAMESPACE } while ( result == VK_INCOMPLETE ); resultCheck( static_cast( result ), VULKAN_HPP_NAMESPACE_STRING "::Device::getFaultData" ); - return data; + return data_; } //=== VK_KHR_surface === @@ -9365,9 +9365,9 @@ namespace VULKAN_HPP_NAMESPACE VULKAN_HPP_ASSERT( getDispatcher()->vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR && "Function requires " ); - std::pair, std::vector> data; - std::vector & counters = data.first; - std::vector & counterDescriptions = data.second; + std::pair, std::vector> data_; + std::vector & counters = data_.first; + std::vector & counterDescriptions = data_.second; uint32_t counterCount; VkResult result; do @@ -9394,7 +9394,7 @@ namespace VULKAN_HPP_NAMESPACE counters.resize( counterCount ); counterDescriptions.resize( counterCount ); } - return data; + return data_; } VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE uint32_t PhysicalDevice::getQueueFamilyPerformanceQueryPassesKHR( @@ -9818,9 +9818,9 @@ namespace VULKAN_HPP_NAMESPACE { VULKAN_HPP_ASSERT( getDispatcher()->vkGetCalibratedTimestampsEXT && "Function requires " ); - std::pair, uint64_t> data( std::piecewise_construct, std::forward_as_tuple( timestampInfos.size() ), std::forward_as_tuple( 0 ) ); - std::vector & timestamps = data.first; - uint64_t & maxDeviation = data.second; + std::pair, uint64_t> data_( std::piecewise_construct, std::forward_as_tuple( timestampInfos.size() ), std::forward_as_tuple( 0 ) ); + std::vector & timestamps = data_.first; + uint64_t & maxDeviation = data_.second; VkResult result = getDispatcher()->vkGetCalibratedTimestampsEXT( static_cast( m_device ), timestampInfos.size(), reinterpret_cast( timestampInfos.data() ), @@ -9828,7 +9828,7 @@ namespace VULKAN_HPP_NAMESPACE &maxDeviation ); resultCheck( static_cast( result ), VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampsEXT" ); - return data; + return data_; } VULKAN_HPP_NODISCARD VULKAN_HPP_INLINE std::pair @@ -9836,14 +9836,14 @@ namespace VULKAN_HPP_NAMESPACE { VULKAN_HPP_ASSERT( getDispatcher()->vkGetCalibratedTimestampsEXT && "Function requires " ); - std::pair data; - uint64_t & timestamp = data.first; - uint64_t & maxDeviation = data.second; + std::pair data_; + uint64_t & timestamp = data_.first; + uint64_t & maxDeviation = data_.second; VkResult result = getDispatcher()->vkGetCalibratedTimestampsEXT( static_cast( m_device ), 1, reinterpret_cast( ×tampInfo ), ×tamp, &maxDeviation ); resultCheck( static_cast( result ), VULKAN_HPP_NAMESPACE_STRING "::Device::getCalibratedTimestampEXT" ); - return data; + return data_; } //=== VK_KHR_fragment_shading_rate ===