diff --git a/VkCppGenerator.cpp b/VkCppGenerator.cpp index 55f8ad9..9eec1a5 100644 --- a/VkCppGenerator.cpp +++ b/VkCppGenerator.cpp @@ -640,8 +640,8 @@ void createDefaults( VkData const& vkData, std::map & d case DependencyData::Category::UNION : // just call the default constructor for flags, structs, and structs (which are mapped to classes) defaultValues[it->name] = it->name + "()"; break; - case DependencyData::Category::FUNC_POINTER : // func_pointers explicitly have no default! - defaultValues[it->name]; + case DependencyData::Category::FUNC_POINTER : // func_pointers default to nullptr + defaultValues[it->name] = "nullptr"; break; case DependencyData::Category::REQUIRED : // all required default to "0" case DependencyData::Category::SCALAR : // all scalars default to "0" @@ -2260,58 +2260,8 @@ void writeMemberData(std::ofstream & ofs, MemberData const& memberData, std::set void writeStructConstructor( std::ofstream & ofs, std::string const& name, StructData const& structData, std::set const& vkTypes, std::map const& defaultValues ) { - // check if there is a member element with no default available - bool noDefault = false; - for (size_t i = 0; i < structData.members.size() && !noDefault; i++) - { - std::map::const_iterator it = defaultValues.find(structData.members[i].pureType); - assert(it != defaultValues.end()); - noDefault = it->second.empty(); - } - - if (!noDefault) - { - // if there's a default for all member, provide a default constructor - ofs << " " << name << "()" << std::endl - << " : " << name << "( "; - bool listedArgument = false; - for (size_t i = 0; i < structData.members.size(); i++) - { - if (listedArgument) - { - ofs << ", "; - } - if ((structData.members[i].name != "pNext") && (structData.members[i].name != "sType")) - { - if (structData.members[i].type.back() == '*') - { - ofs << "nullptr"; - } - else - { - std::map::const_iterator it = defaultValues.find(structData.members[i].pureType); - assert((it != defaultValues.end()) && !it->second.empty()); - - if (structData.members[i].arraySize.empty()) - { - ofs << it->second; - } - else - { - ofs << "{ " << it->second << " }"; - } - } - listedArgument = true; - } - } - ofs << " )" << std::endl - << " {}" << std::endl - << std::endl; - } - - // the constructor with all the elements as arguments + // the constructor with all the elements as arguments, with defaults ofs << " " << name << "( "; - std::vector noDefaultArgs, defaultArgs; bool listedArgument = false; for (size_t i = 0; i::const_iterator defaultIt = defaultValues.find(structData.members[i].pureType); + assert(defaultIt != defaultValues.end()); if (structData.members[i].arraySize.empty()) { - ofs << structData.members[i].type + " " + structData.members[i].name << "_"; + ofs << structData.members[i].type + " " + structData.members[i].name << "_ = " << (structData.members[i].type.back() == '*' ? "nullptr" : defaultIt->second); } else { - ofs << "std::array<" + structData.members[i].type + "," + structData.members[i].arraySize + "> const& " + structData.members[i].name << "_"; + ofs << "std::array<" + structData.members[i].type + "," + structData.members[i].arraySize + "> const& " + structData.members[i].name << "_ = { " << defaultIt->second; + size_t n = atoi(structData.members[i].arraySize.c_str()); + assert(0 < n); + for (size_t j = 1; j < n; j++) + { + ofs << ", " << defaultIt->second; + } + ofs << " }"; } listedArgument = true; } } ofs << " )" << std::endl; - // the body of the constructor, copying over data from argument list into wrapped struct - ofs << " {" << std::endl; - for ( size_t i=0 ; i const& blendConstants_ ) + PipelineColorBlendStateCreateInfo( PipelineColorBlendStateCreateFlags flags_ = PipelineColorBlendStateCreateFlags(), Bool32 logicOpEnable_ = 0, LogicOp logicOp_ = LogicOp::eClear, uint32_t attachmentCount_ = 0, const PipelineColorBlendAttachmentState* pAttachments_ = nullptr, std::array const& blendConstants_ = { 0, 0, 0, 0 } ) + : sType( StructureType::ePipelineColorBlendStateCreateInfo ) + , pNext( nullptr ) + , flags( flags_ ) + , logicOpEnable( logicOpEnable_ ) + , logicOp( logicOp_ ) + , attachmentCount( attachmentCount_ ) + , pAttachments( pAttachments_ ) { - sType = StructureType::ePipelineColorBlendStateCreateInfo; - pNext = nullptr; - flags = flags_; - logicOpEnable = logicOpEnable_; - logicOp = logicOp_; - attachmentCount = attachmentCount_; - pAttachments = pAttachments_; memcpy( &blendConstants, blendConstants_.data(), 4 * sizeof( float ) ); } @@ -8619,15 +8331,11 @@ namespace vk struct FenceCreateInfo { - FenceCreateInfo() - : FenceCreateInfo( FenceCreateFlags() ) - {} - - FenceCreateInfo( FenceCreateFlags flags_ ) + FenceCreateInfo( FenceCreateFlags flags_ = FenceCreateFlags() ) + : sType( StructureType::eFenceCreateInfo ) + , pNext( nullptr ) + , flags( flags_ ) { - sType = StructureType::eFenceCreateInfo; - pNext = nullptr; - flags = flags_; } FenceCreateInfo( VkFenceCreateInfo const & rhs ) @@ -8773,20 +8481,16 @@ namespace vk struct CommandBufferInheritanceInfo { - CommandBufferInheritanceInfo() - : CommandBufferInheritanceInfo( RenderPass(), 0, Framebuffer(), 0, QueryControlFlags(), QueryPipelineStatisticFlags() ) - {} - - CommandBufferInheritanceInfo( RenderPass renderPass_, uint32_t subpass_, Framebuffer framebuffer_, Bool32 occlusionQueryEnable_, QueryControlFlags queryFlags_, QueryPipelineStatisticFlags pipelineStatistics_ ) + CommandBufferInheritanceInfo( RenderPass renderPass_ = RenderPass(), uint32_t subpass_ = 0, Framebuffer framebuffer_ = Framebuffer(), Bool32 occlusionQueryEnable_ = 0, QueryControlFlags queryFlags_ = QueryControlFlags(), QueryPipelineStatisticFlags pipelineStatistics_ = QueryPipelineStatisticFlags() ) + : sType( StructureType::eCommandBufferInheritanceInfo ) + , pNext( nullptr ) + , renderPass( renderPass_ ) + , subpass( subpass_ ) + , framebuffer( framebuffer_ ) + , occlusionQueryEnable( occlusionQueryEnable_ ) + , queryFlags( queryFlags_ ) + , pipelineStatistics( pipelineStatistics_ ) { - sType = StructureType::eCommandBufferInheritanceInfo; - pNext = nullptr; - renderPass = renderPass_; - subpass = subpass_; - framebuffer = framebuffer_; - occlusionQueryEnable = occlusionQueryEnable_; - queryFlags = queryFlags_; - pipelineStatistics = pipelineStatistics_; } CommandBufferInheritanceInfo( VkCommandBufferInheritanceInfo const & rhs ) @@ -8866,16 +8570,12 @@ namespace vk struct CommandBufferBeginInfo { - CommandBufferBeginInfo() - : CommandBufferBeginInfo( CommandBufferUsageFlags(), nullptr ) - {} - - CommandBufferBeginInfo( CommandBufferUsageFlags flags_, const CommandBufferInheritanceInfo* pInheritanceInfo_ ) + CommandBufferBeginInfo( CommandBufferUsageFlags flags_ = CommandBufferUsageFlags(), const CommandBufferInheritanceInfo* pInheritanceInfo_ = nullptr ) + : sType( StructureType::eCommandBufferBeginInfo ) + , pNext( nullptr ) + , flags( flags_ ) + , pInheritanceInfo( pInheritanceInfo_ ) { - sType = StructureType::eCommandBufferBeginInfo; - pNext = nullptr; - flags = flags_; - pInheritanceInfo = pInheritanceInfo_; } CommandBufferBeginInfo( VkCommandBufferBeginInfo const & rhs ) @@ -8927,18 +8627,14 @@ namespace vk struct QueryPoolCreateInfo { - QueryPoolCreateInfo() - : QueryPoolCreateInfo( QueryPoolCreateFlags(), QueryType::eOcclusion, 0, QueryPipelineStatisticFlags() ) - {} - - QueryPoolCreateInfo( QueryPoolCreateFlags flags_, QueryType queryType_, uint32_t queryCount_, QueryPipelineStatisticFlags pipelineStatistics_ ) + QueryPoolCreateInfo( QueryPoolCreateFlags flags_ = QueryPoolCreateFlags(), QueryType queryType_ = QueryType::eOcclusion, uint32_t queryCount_ = 0, QueryPipelineStatisticFlags pipelineStatistics_ = QueryPipelineStatisticFlags() ) + : sType( StructureType::eQueryPoolCreateInfo ) + , pNext( nullptr ) + , flags( flags_ ) + , queryType( queryType_ ) + , queryCount( queryCount_ ) + , pipelineStatistics( pipelineStatistics_ ) { - sType = StructureType::eQueryPoolCreateInfo; - pNext = nullptr; - flags = flags_; - queryType = queryType_; - queryCount = queryCount_; - pipelineStatistics = pipelineStatistics_; } QueryPoolCreateInfo( VkQueryPoolCreateInfo const & rhs ) @@ -9019,15 +8715,11 @@ namespace vk struct ImageSubresource { - ImageSubresource() - : ImageSubresource( ImageAspectFlags(), 0, 0 ) - {} - - ImageSubresource( ImageAspectFlags aspectMask_, uint32_t mipLevel_, uint32_t arrayLayer_ ) + ImageSubresource( ImageAspectFlags aspectMask_ = ImageAspectFlags(), uint32_t mipLevel_ = 0, uint32_t arrayLayer_ = 0 ) + : aspectMask( aspectMask_ ) + , mipLevel( mipLevel_ ) + , arrayLayer( arrayLayer_ ) { - aspectMask = aspectMask_; - mipLevel = mipLevel_; - arrayLayer = arrayLayer_; } ImageSubresource( VkImageSubresource const & rhs ) @@ -9072,16 +8764,12 @@ namespace vk struct ImageSubresourceLayers { - ImageSubresourceLayers() - : ImageSubresourceLayers( ImageAspectFlags(), 0, 0, 0 ) - {} - - ImageSubresourceLayers( ImageAspectFlags aspectMask_, uint32_t mipLevel_, uint32_t baseArrayLayer_, uint32_t layerCount_ ) + ImageSubresourceLayers( ImageAspectFlags aspectMask_ = ImageAspectFlags(), uint32_t mipLevel_ = 0, uint32_t baseArrayLayer_ = 0, uint32_t layerCount_ = 0 ) + : aspectMask( aspectMask_ ) + , mipLevel( mipLevel_ ) + , baseArrayLayer( baseArrayLayer_ ) + , layerCount( layerCount_ ) { - aspectMask = aspectMask_; - mipLevel = mipLevel_; - baseArrayLayer = baseArrayLayer_; - layerCount = layerCount_; } ImageSubresourceLayers( VkImageSubresourceLayers const & rhs ) @@ -9133,17 +8821,13 @@ namespace vk struct ImageSubresourceRange { - ImageSubresourceRange() - : ImageSubresourceRange( ImageAspectFlags(), 0, 0, 0, 0 ) - {} - - ImageSubresourceRange( ImageAspectFlags aspectMask_, uint32_t baseMipLevel_, uint32_t levelCount_, uint32_t baseArrayLayer_, uint32_t layerCount_ ) + ImageSubresourceRange( ImageAspectFlags aspectMask_ = ImageAspectFlags(), uint32_t baseMipLevel_ = 0, uint32_t levelCount_ = 0, uint32_t baseArrayLayer_ = 0, uint32_t layerCount_ = 0 ) + : aspectMask( aspectMask_ ) + , baseMipLevel( baseMipLevel_ ) + , levelCount( levelCount_ ) + , baseArrayLayer( baseArrayLayer_ ) + , layerCount( layerCount_ ) { - aspectMask = aspectMask_; - baseMipLevel = baseMipLevel_; - levelCount = levelCount_; - baseArrayLayer = baseArrayLayer_; - layerCount = layerCount_; } ImageSubresourceRange( VkImageSubresourceRange const & rhs ) @@ -9202,22 +8886,18 @@ namespace vk struct ImageMemoryBarrier { - ImageMemoryBarrier() - : ImageMemoryBarrier( AccessFlags(), AccessFlags(), ImageLayout::eUndefined, ImageLayout::eUndefined, 0, 0, Image(), ImageSubresourceRange() ) - {} - - ImageMemoryBarrier( AccessFlags srcAccessMask_, AccessFlags dstAccessMask_, ImageLayout oldLayout_, ImageLayout newLayout_, uint32_t srcQueueFamilyIndex_, uint32_t dstQueueFamilyIndex_, Image image_, ImageSubresourceRange subresourceRange_ ) + ImageMemoryBarrier( AccessFlags srcAccessMask_ = AccessFlags(), AccessFlags dstAccessMask_ = AccessFlags(), ImageLayout oldLayout_ = ImageLayout::eUndefined, ImageLayout newLayout_ = ImageLayout::eUndefined, uint32_t srcQueueFamilyIndex_ = 0, uint32_t dstQueueFamilyIndex_ = 0, Image image_ = Image(), ImageSubresourceRange subresourceRange_ = ImageSubresourceRange() ) + : sType( StructureType::eImageMemoryBarrier ) + , pNext( nullptr ) + , srcAccessMask( srcAccessMask_ ) + , dstAccessMask( dstAccessMask_ ) + , oldLayout( oldLayout_ ) + , newLayout( newLayout_ ) + , srcQueueFamilyIndex( srcQueueFamilyIndex_ ) + , dstQueueFamilyIndex( dstQueueFamilyIndex_ ) + , image( image_ ) + , subresourceRange( subresourceRange_ ) { - sType = StructureType::eImageMemoryBarrier; - pNext = nullptr; - srcAccessMask = srcAccessMask_; - dstAccessMask = dstAccessMask_; - oldLayout = oldLayout_; - newLayout = newLayout_; - srcQueueFamilyIndex = srcQueueFamilyIndex_; - dstQueueFamilyIndex = dstQueueFamilyIndex_; - image = image_; - subresourceRange = subresourceRange_; } ImageMemoryBarrier( VkImageMemoryBarrier const & rhs ) @@ -9311,20 +8991,16 @@ namespace vk struct ImageViewCreateInfo { - ImageViewCreateInfo() - : ImageViewCreateInfo( ImageViewCreateFlags(), Image(), ImageViewType::e1D, Format::eUndefined, ComponentMapping(), ImageSubresourceRange() ) - {} - - ImageViewCreateInfo( ImageViewCreateFlags flags_, Image image_, ImageViewType viewType_, Format format_, ComponentMapping components_, ImageSubresourceRange subresourceRange_ ) + ImageViewCreateInfo( ImageViewCreateFlags flags_ = ImageViewCreateFlags(), Image image_ = Image(), ImageViewType viewType_ = ImageViewType::e1D, Format format_ = Format::eUndefined, ComponentMapping components_ = ComponentMapping(), ImageSubresourceRange subresourceRange_ = ImageSubresourceRange() ) + : sType( StructureType::eImageViewCreateInfo ) + , pNext( nullptr ) + , flags( flags_ ) + , image( image_ ) + , viewType( viewType_ ) + , format( format_ ) + , components( components_ ) + , subresourceRange( subresourceRange_ ) { - sType = StructureType::eImageViewCreateInfo; - pNext = nullptr; - flags = flags_; - image = image_; - viewType = viewType_; - format = format_; - components = components_; - subresourceRange = subresourceRange_; } ImageViewCreateInfo( VkImageViewCreateInfo const & rhs ) @@ -9404,17 +9080,13 @@ namespace vk struct ImageCopy { - ImageCopy() - : ImageCopy( ImageSubresourceLayers(), Offset3D(), ImageSubresourceLayers(), Offset3D(), Extent3D() ) - {} - - ImageCopy( ImageSubresourceLayers srcSubresource_, Offset3D srcOffset_, ImageSubresourceLayers dstSubresource_, Offset3D dstOffset_, Extent3D extent_ ) + ImageCopy( ImageSubresourceLayers srcSubresource_ = ImageSubresourceLayers(), Offset3D srcOffset_ = Offset3D(), ImageSubresourceLayers dstSubresource_ = ImageSubresourceLayers(), Offset3D dstOffset_ = Offset3D(), Extent3D extent_ = Extent3D() ) + : srcSubresource( srcSubresource_ ) + , srcOffset( srcOffset_ ) + , dstSubresource( dstSubresource_ ) + , dstOffset( dstOffset_ ) + , extent( extent_ ) { - srcSubresource = srcSubresource_; - srcOffset = srcOffset_; - dstSubresource = dstSubresource_; - dstOffset = dstOffset_; - extent = extent_; } ImageCopy( VkImageCopy const & rhs ) @@ -9473,15 +9145,11 @@ namespace vk struct ImageBlit { - ImageBlit() - : ImageBlit( ImageSubresourceLayers(), { Offset3D() }, ImageSubresourceLayers(), { Offset3D() } ) - {} - - ImageBlit( ImageSubresourceLayers srcSubresource_, std::array const& srcOffsets_, ImageSubresourceLayers dstSubresource_, std::array const& dstOffsets_ ) + ImageBlit( ImageSubresourceLayers srcSubresource_ = ImageSubresourceLayers(), std::array const& srcOffsets_ = { Offset3D(), Offset3D() }, ImageSubresourceLayers dstSubresource_ = ImageSubresourceLayers(), std::array const& dstOffsets_ = { Offset3D(), Offset3D() } ) + : srcSubresource( srcSubresource_ ) + , dstSubresource( dstSubresource_ ) { - srcSubresource = srcSubresource_; memcpy( &srcOffsets, srcOffsets_.data(), 2 * sizeof( Offset3D ) ); - dstSubresource = dstSubresource_; memcpy( &dstOffsets, dstOffsets_.data(), 2 * sizeof( Offset3D ) ); } @@ -9534,18 +9202,14 @@ namespace vk struct BufferImageCopy { - BufferImageCopy() - : BufferImageCopy( 0, 0, 0, ImageSubresourceLayers(), Offset3D(), Extent3D() ) - {} - - BufferImageCopy( DeviceSize bufferOffset_, uint32_t bufferRowLength_, uint32_t bufferImageHeight_, ImageSubresourceLayers imageSubresource_, Offset3D imageOffset_, Extent3D imageExtent_ ) + BufferImageCopy( DeviceSize bufferOffset_ = 0, uint32_t bufferRowLength_ = 0, uint32_t bufferImageHeight_ = 0, ImageSubresourceLayers imageSubresource_ = ImageSubresourceLayers(), Offset3D imageOffset_ = Offset3D(), Extent3D imageExtent_ = Extent3D() ) + : bufferOffset( bufferOffset_ ) + , bufferRowLength( bufferRowLength_ ) + , bufferImageHeight( bufferImageHeight_ ) + , imageSubresource( imageSubresource_ ) + , imageOffset( imageOffset_ ) + , imageExtent( imageExtent_ ) { - bufferOffset = bufferOffset_; - bufferRowLength = bufferRowLength_; - bufferImageHeight = bufferImageHeight_; - imageSubresource = imageSubresource_; - imageOffset = imageOffset_; - imageExtent = imageExtent_; } BufferImageCopy( VkBufferImageCopy const & rhs ) @@ -9611,17 +9275,13 @@ namespace vk struct ImageResolve { - ImageResolve() - : ImageResolve( ImageSubresourceLayers(), Offset3D(), ImageSubresourceLayers(), Offset3D(), Extent3D() ) - {} - - ImageResolve( ImageSubresourceLayers srcSubresource_, Offset3D srcOffset_, ImageSubresourceLayers dstSubresource_, Offset3D dstOffset_, Extent3D extent_ ) + ImageResolve( ImageSubresourceLayers srcSubresource_ = ImageSubresourceLayers(), Offset3D srcOffset_ = Offset3D(), ImageSubresourceLayers dstSubresource_ = ImageSubresourceLayers(), Offset3D dstOffset_ = Offset3D(), Extent3D extent_ = Extent3D() ) + : srcSubresource( srcSubresource_ ) + , srcOffset( srcOffset_ ) + , dstSubresource( dstSubresource_ ) + , dstOffset( dstOffset_ ) + , extent( extent_ ) { - srcSubresource = srcSubresource_; - srcOffset = srcOffset_; - dstSubresource = dstSubresource_; - dstOffset = dstOffset_; - extent = extent_; } ImageResolve( VkImageResolve const & rhs ) @@ -9680,15 +9340,11 @@ namespace vk struct ClearAttachment { - ClearAttachment() - : ClearAttachment( ImageAspectFlags(), 0, ClearValue() ) - {} - - ClearAttachment( ImageAspectFlags aspectMask_, uint32_t colorAttachment_, ClearValue clearValue_ ) + ClearAttachment( ImageAspectFlags aspectMask_ = ImageAspectFlags(), uint32_t colorAttachment_ = 0, ClearValue clearValue_ = ClearValue() ) + : aspectMask( aspectMask_ ) + , colorAttachment( colorAttachment_ ) + , clearValue( clearValue_ ) { - aspectMask = aspectMask_; - colorAttachment = colorAttachment_; - clearValue = clearValue_; } ClearAttachment( VkClearAttachment const & rhs ) @@ -9787,17 +9443,13 @@ namespace vk struct SparseMemoryBind { - SparseMemoryBind() - : SparseMemoryBind( 0, 0, DeviceMemory(), 0, SparseMemoryBindFlags() ) - {} - - SparseMemoryBind( DeviceSize resourceOffset_, DeviceSize size_, DeviceMemory memory_, DeviceSize memoryOffset_, SparseMemoryBindFlags flags_ ) + SparseMemoryBind( DeviceSize resourceOffset_ = 0, DeviceSize size_ = 0, DeviceMemory memory_ = DeviceMemory(), DeviceSize memoryOffset_ = 0, SparseMemoryBindFlags flags_ = SparseMemoryBindFlags() ) + : resourceOffset( resourceOffset_ ) + , size( size_ ) + , memory( memory_ ) + , memoryOffset( memoryOffset_ ) + , flags( flags_ ) { - resourceOffset = resourceOffset_; - size = size_; - memory = memory_; - memoryOffset = memoryOffset_; - flags = flags_; } SparseMemoryBind( VkSparseMemoryBind const & rhs ) @@ -9856,18 +9508,14 @@ namespace vk struct SparseImageMemoryBind { - SparseImageMemoryBind() - : SparseImageMemoryBind( ImageSubresource(), Offset3D(), Extent3D(), DeviceMemory(), 0, SparseMemoryBindFlags() ) - {} - - SparseImageMemoryBind( ImageSubresource subresource_, Offset3D offset_, Extent3D extent_, DeviceMemory memory_, DeviceSize memoryOffset_, SparseMemoryBindFlags flags_ ) + SparseImageMemoryBind( ImageSubresource subresource_ = ImageSubresource(), Offset3D offset_ = Offset3D(), Extent3D extent_ = Extent3D(), DeviceMemory memory_ = DeviceMemory(), DeviceSize memoryOffset_ = 0, SparseMemoryBindFlags flags_ = SparseMemoryBindFlags() ) + : subresource( subresource_ ) + , offset( offset_ ) + , extent( extent_ ) + , memory( memory_ ) + , memoryOffset( memoryOffset_ ) + , flags( flags_ ) { - subresource = subresource_; - offset = offset_; - extent = extent_; - memory = memory_; - memoryOffset = memoryOffset_; - flags = flags_; } SparseImageMemoryBind( VkSparseImageMemoryBind const & rhs ) @@ -9933,15 +9581,11 @@ namespace vk struct SparseBufferMemoryBindInfo { - SparseBufferMemoryBindInfo() - : SparseBufferMemoryBindInfo( Buffer(), 0, nullptr ) - {} - - SparseBufferMemoryBindInfo( Buffer buffer_, uint32_t bindCount_, const SparseMemoryBind* pBinds_ ) + SparseBufferMemoryBindInfo( Buffer buffer_ = Buffer(), uint32_t bindCount_ = 0, const SparseMemoryBind* pBinds_ = nullptr ) + : buffer( buffer_ ) + , bindCount( bindCount_ ) + , pBinds( pBinds_ ) { - buffer = buffer_; - bindCount = bindCount_; - pBinds = pBinds_; } SparseBufferMemoryBindInfo( VkSparseBufferMemoryBindInfo const & rhs ) @@ -9986,15 +9630,11 @@ namespace vk struct SparseImageOpaqueMemoryBindInfo { - SparseImageOpaqueMemoryBindInfo() - : SparseImageOpaqueMemoryBindInfo( Image(), 0, nullptr ) - {} - - SparseImageOpaqueMemoryBindInfo( Image image_, uint32_t bindCount_, const SparseMemoryBind* pBinds_ ) + SparseImageOpaqueMemoryBindInfo( Image image_ = Image(), uint32_t bindCount_ = 0, const SparseMemoryBind* pBinds_ = nullptr ) + : image( image_ ) + , bindCount( bindCount_ ) + , pBinds( pBinds_ ) { - image = image_; - bindCount = bindCount_; - pBinds = pBinds_; } SparseImageOpaqueMemoryBindInfo( VkSparseImageOpaqueMemoryBindInfo const & rhs ) @@ -10039,15 +9679,11 @@ namespace vk struct SparseImageMemoryBindInfo { - SparseImageMemoryBindInfo() - : SparseImageMemoryBindInfo( Image(), 0, nullptr ) - {} - - SparseImageMemoryBindInfo( Image image_, uint32_t bindCount_, const SparseImageMemoryBind* pBinds_ ) + SparseImageMemoryBindInfo( Image image_ = Image(), uint32_t bindCount_ = 0, const SparseImageMemoryBind* pBinds_ = nullptr ) + : image( image_ ) + , bindCount( bindCount_ ) + , pBinds( pBinds_ ) { - image = image_; - bindCount = bindCount_; - pBinds = pBinds_; } SparseImageMemoryBindInfo( VkSparseImageMemoryBindInfo const & rhs ) @@ -10092,24 +9728,20 @@ namespace vk struct BindSparseInfo { - BindSparseInfo() - : BindSparseInfo( 0, nullptr, 0, nullptr, 0, nullptr, 0, nullptr, 0, nullptr ) - {} - - BindSparseInfo( uint32_t waitSemaphoreCount_, const Semaphore* pWaitSemaphores_, uint32_t bufferBindCount_, const SparseBufferMemoryBindInfo* pBufferBinds_, uint32_t imageOpaqueBindCount_, const SparseImageOpaqueMemoryBindInfo* pImageOpaqueBinds_, uint32_t imageBindCount_, const SparseImageMemoryBindInfo* pImageBinds_, uint32_t signalSemaphoreCount_, const Semaphore* pSignalSemaphores_ ) + BindSparseInfo( uint32_t waitSemaphoreCount_ = 0, const Semaphore* pWaitSemaphores_ = nullptr, uint32_t bufferBindCount_ = 0, const SparseBufferMemoryBindInfo* pBufferBinds_ = nullptr, uint32_t imageOpaqueBindCount_ = 0, const SparseImageOpaqueMemoryBindInfo* pImageOpaqueBinds_ = nullptr, uint32_t imageBindCount_ = 0, const SparseImageMemoryBindInfo* pImageBinds_ = nullptr, uint32_t signalSemaphoreCount_ = 0, const Semaphore* pSignalSemaphores_ = nullptr ) + : sType( StructureType::eBindSparseInfo ) + , pNext( nullptr ) + , waitSemaphoreCount( waitSemaphoreCount_ ) + , pWaitSemaphores( pWaitSemaphores_ ) + , bufferBindCount( bufferBindCount_ ) + , pBufferBinds( pBufferBinds_ ) + , imageOpaqueBindCount( imageOpaqueBindCount_ ) + , pImageOpaqueBinds( pImageOpaqueBinds_ ) + , imageBindCount( imageBindCount_ ) + , pImageBinds( pImageBinds_ ) + , signalSemaphoreCount( signalSemaphoreCount_ ) + , pSignalSemaphores( pSignalSemaphores_ ) { - sType = StructureType::eBindSparseInfo; - pNext = nullptr; - waitSemaphoreCount = waitSemaphoreCount_; - pWaitSemaphores = pWaitSemaphores_; - bufferBindCount = bufferBindCount_; - pBufferBinds = pBufferBinds_; - imageOpaqueBindCount = imageOpaqueBindCount_; - pImageOpaqueBinds = pImageOpaqueBinds_; - imageBindCount = imageBindCount_; - pImageBinds = pImageBinds_; - signalSemaphoreCount = signalSemaphoreCount_; - pSignalSemaphores = pSignalSemaphores_; } BindSparseInfo( VkBindSparseInfo const & rhs ) @@ -10258,16 +9890,12 @@ namespace vk struct CommandPoolCreateInfo { - CommandPoolCreateInfo() - : CommandPoolCreateInfo( CommandPoolCreateFlags(), 0 ) - {} - - CommandPoolCreateInfo( CommandPoolCreateFlags flags_, uint32_t queueFamilyIndex_ ) + CommandPoolCreateInfo( CommandPoolCreateFlags flags_ = CommandPoolCreateFlags(), uint32_t queueFamilyIndex_ = 0 ) + : sType( StructureType::eCommandPoolCreateInfo ) + , pNext( nullptr ) + , flags( flags_ ) + , queueFamilyIndex( queueFamilyIndex_ ) { - sType = StructureType::eCommandPoolCreateInfo; - pNext = nullptr; - flags = flags_; - queueFamilyIndex = queueFamilyIndex_; } CommandPoolCreateInfo( VkCommandPoolCreateInfo const & rhs ) @@ -10376,27 +10004,23 @@ namespace vk struct ImageCreateInfo { - ImageCreateInfo() - : ImageCreateInfo( ImageCreateFlags(), ImageType::e1D, Format::eUndefined, Extent3D(), 0, 0, SampleCountFlagBits::e1, ImageTiling::eOptimal, ImageUsageFlags(), SharingMode::eExclusive, 0, nullptr, ImageLayout::eUndefined ) - {} - - ImageCreateInfo( ImageCreateFlags flags_, ImageType imageType_, Format format_, Extent3D extent_, uint32_t mipLevels_, uint32_t arrayLayers_, SampleCountFlagBits samples_, ImageTiling tiling_, ImageUsageFlags usage_, SharingMode sharingMode_, uint32_t queueFamilyIndexCount_, const uint32_t* pQueueFamilyIndices_, ImageLayout initialLayout_ ) + ImageCreateInfo( ImageCreateFlags flags_ = ImageCreateFlags(), ImageType imageType_ = ImageType::e1D, Format format_ = Format::eUndefined, Extent3D extent_ = Extent3D(), uint32_t mipLevels_ = 0, uint32_t arrayLayers_ = 0, SampleCountFlagBits samples_ = SampleCountFlagBits::e1, ImageTiling tiling_ = ImageTiling::eOptimal, ImageUsageFlags usage_ = ImageUsageFlags(), SharingMode sharingMode_ = SharingMode::eExclusive, uint32_t queueFamilyIndexCount_ = 0, const uint32_t* pQueueFamilyIndices_ = nullptr, ImageLayout initialLayout_ = ImageLayout::eUndefined ) + : sType( StructureType::eImageCreateInfo ) + , pNext( nullptr ) + , flags( flags_ ) + , imageType( imageType_ ) + , format( format_ ) + , extent( extent_ ) + , mipLevels( mipLevels_ ) + , arrayLayers( arrayLayers_ ) + , samples( samples_ ) + , tiling( tiling_ ) + , usage( usage_ ) + , sharingMode( sharingMode_ ) + , queueFamilyIndexCount( queueFamilyIndexCount_ ) + , pQueueFamilyIndices( pQueueFamilyIndices_ ) + , initialLayout( initialLayout_ ) { - sType = StructureType::eImageCreateInfo; - pNext = nullptr; - flags = flags_; - imageType = imageType_; - format = format_; - extent = extent_; - mipLevels = mipLevels_; - arrayLayers = arrayLayers_; - samples = samples_; - tiling = tiling_; - usage = usage_; - sharingMode = sharingMode_; - queueFamilyIndexCount = queueFamilyIndexCount_; - pQueueFamilyIndices = pQueueFamilyIndices_; - initialLayout = initialLayout_; } ImageCreateInfo( VkImageCreateInfo const & rhs ) @@ -10525,21 +10149,17 @@ namespace vk struct PipelineMultisampleStateCreateInfo { - PipelineMultisampleStateCreateInfo() - : PipelineMultisampleStateCreateInfo( PipelineMultisampleStateCreateFlags(), SampleCountFlagBits::e1, 0, 0, nullptr, 0, 0 ) - {} - - PipelineMultisampleStateCreateInfo( PipelineMultisampleStateCreateFlags flags_, SampleCountFlagBits rasterizationSamples_, Bool32 sampleShadingEnable_, float minSampleShading_, const SampleMask* pSampleMask_, Bool32 alphaToCoverageEnable_, Bool32 alphaToOneEnable_ ) + PipelineMultisampleStateCreateInfo( PipelineMultisampleStateCreateFlags flags_ = PipelineMultisampleStateCreateFlags(), SampleCountFlagBits rasterizationSamples_ = SampleCountFlagBits::e1, Bool32 sampleShadingEnable_ = 0, float minSampleShading_ = 0, const SampleMask* pSampleMask_ = nullptr, Bool32 alphaToCoverageEnable_ = 0, Bool32 alphaToOneEnable_ = 0 ) + : sType( StructureType::ePipelineMultisampleStateCreateInfo ) + , pNext( nullptr ) + , flags( flags_ ) + , rasterizationSamples( rasterizationSamples_ ) + , sampleShadingEnable( sampleShadingEnable_ ) + , minSampleShading( minSampleShading_ ) + , pSampleMask( pSampleMask_ ) + , alphaToCoverageEnable( alphaToCoverageEnable_ ) + , alphaToOneEnable( alphaToOneEnable_ ) { - sType = StructureType::ePipelineMultisampleStateCreateInfo; - pNext = nullptr; - flags = flags_; - rasterizationSamples = rasterizationSamples_; - sampleShadingEnable = sampleShadingEnable_; - minSampleShading = minSampleShading_; - pSampleMask = pSampleMask_; - alphaToCoverageEnable = alphaToCoverageEnable_; - alphaToOneEnable = alphaToOneEnable_; } PipelineMultisampleStateCreateInfo( VkPipelineMultisampleStateCreateInfo const & rhs ) @@ -10626,31 +10246,27 @@ namespace vk struct GraphicsPipelineCreateInfo { - GraphicsPipelineCreateInfo() - : GraphicsPipelineCreateInfo( PipelineCreateFlags(), 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, PipelineLayout(), RenderPass(), 0, Pipeline(), 0 ) - {} - - GraphicsPipelineCreateInfo( PipelineCreateFlags flags_, uint32_t stageCount_, const PipelineShaderStageCreateInfo* pStages_, const PipelineVertexInputStateCreateInfo* pVertexInputState_, const PipelineInputAssemblyStateCreateInfo* pInputAssemblyState_, const PipelineTessellationStateCreateInfo* pTessellationState_, const PipelineViewportStateCreateInfo* pViewportState_, const PipelineRasterizationStateCreateInfo* pRasterizationState_, const PipelineMultisampleStateCreateInfo* pMultisampleState_, const PipelineDepthStencilStateCreateInfo* pDepthStencilState_, const PipelineColorBlendStateCreateInfo* pColorBlendState_, const PipelineDynamicStateCreateInfo* pDynamicState_, PipelineLayout layout_, RenderPass renderPass_, uint32_t subpass_, Pipeline basePipelineHandle_, int32_t basePipelineIndex_ ) + GraphicsPipelineCreateInfo( PipelineCreateFlags flags_ = PipelineCreateFlags(), uint32_t stageCount_ = 0, const PipelineShaderStageCreateInfo* pStages_ = nullptr, const PipelineVertexInputStateCreateInfo* pVertexInputState_ = nullptr, const PipelineInputAssemblyStateCreateInfo* pInputAssemblyState_ = nullptr, const PipelineTessellationStateCreateInfo* pTessellationState_ = nullptr, const PipelineViewportStateCreateInfo* pViewportState_ = nullptr, const PipelineRasterizationStateCreateInfo* pRasterizationState_ = nullptr, const PipelineMultisampleStateCreateInfo* pMultisampleState_ = nullptr, const PipelineDepthStencilStateCreateInfo* pDepthStencilState_ = nullptr, const PipelineColorBlendStateCreateInfo* pColorBlendState_ = nullptr, const PipelineDynamicStateCreateInfo* pDynamicState_ = nullptr, PipelineLayout layout_ = PipelineLayout(), RenderPass renderPass_ = RenderPass(), uint32_t subpass_ = 0, Pipeline basePipelineHandle_ = Pipeline(), int32_t basePipelineIndex_ = 0 ) + : sType( StructureType::eGraphicsPipelineCreateInfo ) + , pNext( nullptr ) + , flags( flags_ ) + , stageCount( stageCount_ ) + , pStages( pStages_ ) + , pVertexInputState( pVertexInputState_ ) + , pInputAssemblyState( pInputAssemblyState_ ) + , pTessellationState( pTessellationState_ ) + , pViewportState( pViewportState_ ) + , pRasterizationState( pRasterizationState_ ) + , pMultisampleState( pMultisampleState_ ) + , pDepthStencilState( pDepthStencilState_ ) + , pColorBlendState( pColorBlendState_ ) + , pDynamicState( pDynamicState_ ) + , layout( layout_ ) + , renderPass( renderPass_ ) + , subpass( subpass_ ) + , basePipelineHandle( basePipelineHandle_ ) + , basePipelineIndex( basePipelineIndex_ ) { - sType = StructureType::eGraphicsPipelineCreateInfo; - pNext = nullptr; - flags = flags_; - stageCount = stageCount_; - pStages = pStages_; - pVertexInputState = pVertexInputState_; - pInputAssemblyState = pInputAssemblyState_; - pTessellationState = pTessellationState_; - pViewportState = pViewportState_; - pRasterizationState = pRasterizationState_; - pMultisampleState = pMultisampleState_; - pDepthStencilState = pDepthStencilState_; - pColorBlendState = pColorBlendState_; - pDynamicState = pDynamicState_; - layout = layout_; - renderPass = renderPass_; - subpass = subpass_; - basePipelineHandle = basePipelineHandle_; - basePipelineIndex = basePipelineIndex_; } GraphicsPipelineCreateInfo( VkGraphicsPipelineCreateInfo const & rhs ) @@ -10954,21 +10570,17 @@ namespace vk struct AttachmentDescription { - AttachmentDescription() - : AttachmentDescription( AttachmentDescriptionFlags(), Format::eUndefined, SampleCountFlagBits::e1, AttachmentLoadOp::eLoad, AttachmentStoreOp::eStore, AttachmentLoadOp::eLoad, AttachmentStoreOp::eStore, ImageLayout::eUndefined, ImageLayout::eUndefined ) - {} - - AttachmentDescription( AttachmentDescriptionFlags flags_, Format format_, SampleCountFlagBits samples_, AttachmentLoadOp loadOp_, AttachmentStoreOp storeOp_, AttachmentLoadOp stencilLoadOp_, AttachmentStoreOp stencilStoreOp_, ImageLayout initialLayout_, ImageLayout finalLayout_ ) + AttachmentDescription( AttachmentDescriptionFlags flags_ = AttachmentDescriptionFlags(), Format format_ = Format::eUndefined, SampleCountFlagBits samples_ = SampleCountFlagBits::e1, AttachmentLoadOp loadOp_ = AttachmentLoadOp::eLoad, AttachmentStoreOp storeOp_ = AttachmentStoreOp::eStore, AttachmentLoadOp stencilLoadOp_ = AttachmentLoadOp::eLoad, AttachmentStoreOp stencilStoreOp_ = AttachmentStoreOp::eStore, ImageLayout initialLayout_ = ImageLayout::eUndefined, ImageLayout finalLayout_ = ImageLayout::eUndefined ) + : flags( flags_ ) + , format( format_ ) + , samples( samples_ ) + , loadOp( loadOp_ ) + , storeOp( storeOp_ ) + , stencilLoadOp( stencilLoadOp_ ) + , stencilStoreOp( stencilStoreOp_ ) + , initialLayout( initialLayout_ ) + , finalLayout( finalLayout_ ) { - flags = flags_; - format = format_; - samples = samples_; - loadOp = loadOp_; - storeOp = storeOp_; - stencilLoadOp = stencilLoadOp_; - stencilStoreOp = stencilStoreOp_; - initialLayout = initialLayout_; - finalLayout = finalLayout_; } AttachmentDescription( VkAttachmentDescription const & rhs ) @@ -11081,18 +10693,14 @@ namespace vk struct DescriptorPoolCreateInfo { - DescriptorPoolCreateInfo() - : DescriptorPoolCreateInfo( DescriptorPoolCreateFlags(), 0, 0, nullptr ) - {} - - DescriptorPoolCreateInfo( DescriptorPoolCreateFlags flags_, uint32_t maxSets_, uint32_t poolSizeCount_, const DescriptorPoolSize* pPoolSizes_ ) + DescriptorPoolCreateInfo( DescriptorPoolCreateFlags flags_ = DescriptorPoolCreateFlags(), uint32_t maxSets_ = 0, uint32_t poolSizeCount_ = 0, const DescriptorPoolSize* pPoolSizes_ = nullptr ) + : sType( StructureType::eDescriptorPoolCreateInfo ) + , pNext( nullptr ) + , flags( flags_ ) + , maxSets( maxSets_ ) + , poolSizeCount( poolSizeCount_ ) + , pPoolSizes( pPoolSizes_ ) { - sType = StructureType::eDescriptorPoolCreateInfo; - pNext = nullptr; - flags = flags_; - maxSets = maxSets_; - poolSizeCount = poolSizeCount_; - pPoolSizes = pPoolSizes_; } DescriptorPoolCreateInfo( VkDescriptorPoolCreateInfo const & rhs ) @@ -11844,19 +11452,15 @@ namespace vk struct SubpassDependency { - SubpassDependency() - : SubpassDependency( 0, 0, PipelineStageFlags(), PipelineStageFlags(), AccessFlags(), AccessFlags(), DependencyFlags() ) - {} - - SubpassDependency( uint32_t srcSubpass_, uint32_t dstSubpass_, PipelineStageFlags srcStageMask_, PipelineStageFlags dstStageMask_, AccessFlags srcAccessMask_, AccessFlags dstAccessMask_, DependencyFlags dependencyFlags_ ) + SubpassDependency( uint32_t srcSubpass_ = 0, uint32_t dstSubpass_ = 0, PipelineStageFlags srcStageMask_ = PipelineStageFlags(), PipelineStageFlags dstStageMask_ = PipelineStageFlags(), AccessFlags srcAccessMask_ = AccessFlags(), AccessFlags dstAccessMask_ = AccessFlags(), DependencyFlags dependencyFlags_ = DependencyFlags() ) + : srcSubpass( srcSubpass_ ) + , dstSubpass( dstSubpass_ ) + , srcStageMask( srcStageMask_ ) + , dstStageMask( dstStageMask_ ) + , srcAccessMask( srcAccessMask_ ) + , dstAccessMask( dstAccessMask_ ) + , dependencyFlags( dependencyFlags_ ) { - srcSubpass = srcSubpass_; - dstSubpass = dstSubpass_; - srcStageMask = srcStageMask_; - dstStageMask = dstStageMask_; - srcAccessMask = srcAccessMask_; - dstAccessMask = dstAccessMask_; - dependencyFlags = dependencyFlags_; } SubpassDependency( VkSubpassDependency const & rhs ) @@ -11929,21 +11533,17 @@ namespace vk struct RenderPassCreateInfo { - RenderPassCreateInfo() - : RenderPassCreateInfo( RenderPassCreateFlags(), 0, nullptr, 0, nullptr, 0, nullptr ) - {} - - RenderPassCreateInfo( RenderPassCreateFlags flags_, uint32_t attachmentCount_, const AttachmentDescription* pAttachments_, uint32_t subpassCount_, const SubpassDescription* pSubpasses_, uint32_t dependencyCount_, const SubpassDependency* pDependencies_ ) + RenderPassCreateInfo( RenderPassCreateFlags flags_ = RenderPassCreateFlags(), uint32_t attachmentCount_ = 0, const AttachmentDescription* pAttachments_ = nullptr, uint32_t subpassCount_ = 0, const SubpassDescription* pSubpasses_ = nullptr, uint32_t dependencyCount_ = 0, const SubpassDependency* pDependencies_ = nullptr ) + : sType( StructureType::eRenderPassCreateInfo ) + , pNext( nullptr ) + , flags( flags_ ) + , attachmentCount( attachmentCount_ ) + , pAttachments( pAttachments_ ) + , subpassCount( subpassCount_ ) + , pSubpasses( pSubpasses_ ) + , dependencyCount( dependencyCount_ ) + , pDependencies( pDependencies_ ) { - sType = StructureType::eRenderPassCreateInfo; - pNext = nullptr; - flags = flags_; - attachmentCount = attachmentCount_; - pAttachments = pAttachments_; - subpassCount = subpassCount_; - pSubpasses = pSubpasses_; - dependencyCount = dependencyCount_; - pDependencies = pDependencies_; } RenderPassCreateInfo( VkRenderPassCreateInfo const & rhs ) @@ -12030,21 +11630,17 @@ namespace vk struct SubmitInfo { - SubmitInfo() - : SubmitInfo( 0, nullptr, nullptr, 0, nullptr, 0, nullptr ) - {} - - SubmitInfo( uint32_t waitSemaphoreCount_, const Semaphore* pWaitSemaphores_, const PipelineStageFlags* pWaitDstStageMask_, uint32_t commandBufferCount_, const CommandBuffer* pCommandBuffers_, uint32_t signalSemaphoreCount_, const Semaphore* pSignalSemaphores_ ) + SubmitInfo( uint32_t waitSemaphoreCount_ = 0, const Semaphore* pWaitSemaphores_ = nullptr, const PipelineStageFlags* pWaitDstStageMask_ = nullptr, uint32_t commandBufferCount_ = 0, const CommandBuffer* pCommandBuffers_ = nullptr, uint32_t signalSemaphoreCount_ = 0, const Semaphore* pSignalSemaphores_ = nullptr ) + : sType( StructureType::eSubmitInfo ) + , pNext( nullptr ) + , waitSemaphoreCount( waitSemaphoreCount_ ) + , pWaitSemaphores( pWaitSemaphores_ ) + , pWaitDstStageMask( pWaitDstStageMask_ ) + , commandBufferCount( commandBufferCount_ ) + , pCommandBuffers( pCommandBuffers_ ) + , signalSemaphoreCount( signalSemaphoreCount_ ) + , pSignalSemaphores( pSignalSemaphores_ ) { - sType = StructureType::eSubmitInfo; - pNext = nullptr; - waitSemaphoreCount = waitSemaphoreCount_; - pWaitSemaphores = pWaitSemaphores_; - pWaitDstStageMask = pWaitDstStageMask_; - commandBufferCount = commandBufferCount_; - pCommandBuffers = pCommandBuffers_; - signalSemaphoreCount = signalSemaphoreCount_; - pSignalSemaphores = pSignalSemaphores_; } SubmitInfo( VkSubmitInfo const & rhs ) @@ -12240,14 +11836,10 @@ namespace vk struct SurfaceFormatKHR { - SurfaceFormatKHR() - : SurfaceFormatKHR( Format::eUndefined, ColorSpaceKHR::eVkColorspaceSrgbNonlinear ) - {} - - SurfaceFormatKHR( Format format_, ColorSpaceKHR colorSpace_ ) + SurfaceFormatKHR( Format format_ = Format::eUndefined, ColorSpaceKHR colorSpace_ = ColorSpaceKHR::eVkColorspaceSrgbNonlinear ) + : format( format_ ) + , colorSpace( colorSpace_ ) { - format = format_; - colorSpace = colorSpace_; } SurfaceFormatKHR( VkSurfaceFormatKHR const & rhs ) @@ -12300,21 +11892,17 @@ namespace vk struct DisplayPlaneCapabilitiesKHR { - DisplayPlaneCapabilitiesKHR() - : DisplayPlaneCapabilitiesKHR( DisplayPlaneAlphaFlagsKHR(), Offset2D(), Offset2D(), Extent2D(), Extent2D(), Offset2D(), Offset2D(), Extent2D(), Extent2D() ) - {} - - DisplayPlaneCapabilitiesKHR( DisplayPlaneAlphaFlagsKHR supportedAlpha_, Offset2D minSrcPosition_, Offset2D maxSrcPosition_, Extent2D minSrcExtent_, Extent2D maxSrcExtent_, Offset2D minDstPosition_, Offset2D maxDstPosition_, Extent2D minDstExtent_, Extent2D maxDstExtent_ ) + DisplayPlaneCapabilitiesKHR( DisplayPlaneAlphaFlagsKHR supportedAlpha_ = DisplayPlaneAlphaFlagsKHR(), Offset2D minSrcPosition_ = Offset2D(), Offset2D maxSrcPosition_ = Offset2D(), Extent2D minSrcExtent_ = Extent2D(), Extent2D maxSrcExtent_ = Extent2D(), Offset2D minDstPosition_ = Offset2D(), Offset2D maxDstPosition_ = Offset2D(), Extent2D minDstExtent_ = Extent2D(), Extent2D maxDstExtent_ = Extent2D() ) + : supportedAlpha( supportedAlpha_ ) + , minSrcPosition( minSrcPosition_ ) + , maxSrcPosition( maxSrcPosition_ ) + , minSrcExtent( minSrcExtent_ ) + , maxSrcExtent( maxSrcExtent_ ) + , minDstPosition( minDstPosition_ ) + , maxDstPosition( maxDstPosition_ ) + , minDstExtent( minDstExtent_ ) + , maxDstExtent( maxDstExtent_ ) { - supportedAlpha = supportedAlpha_; - minSrcPosition = minSrcPosition_; - maxSrcPosition = maxSrcPosition_; - minSrcExtent = minSrcExtent_; - maxSrcExtent = maxSrcExtent_; - minDstPosition = minDstPosition_; - maxDstPosition = maxDstPosition_; - minDstExtent = minDstExtent_; - maxDstExtent = maxDstExtent_; } DisplayPlaneCapabilitiesKHR( VkDisplayPlaneCapabilitiesKHR const & rhs ) @@ -12436,19 +12024,15 @@ namespace vk struct DisplayPropertiesKHR { - DisplayPropertiesKHR() - : DisplayPropertiesKHR( DisplayKHR(), nullptr, Extent2D(), Extent2D(), SurfaceTransformFlagsKHR(), 0, 0 ) - {} - - DisplayPropertiesKHR( DisplayKHR display_, const char* displayName_, Extent2D physicalDimensions_, Extent2D physicalResolution_, SurfaceTransformFlagsKHR supportedTransforms_, Bool32 planeReorderPossible_, Bool32 persistentContent_ ) + DisplayPropertiesKHR( DisplayKHR display_ = DisplayKHR(), const char* displayName_ = nullptr, Extent2D physicalDimensions_ = Extent2D(), Extent2D physicalResolution_ = Extent2D(), SurfaceTransformFlagsKHR supportedTransforms_ = SurfaceTransformFlagsKHR(), Bool32 planeReorderPossible_ = 0, Bool32 persistentContent_ = 0 ) + : display( display_ ) + , displayName( displayName_ ) + , physicalDimensions( physicalDimensions_ ) + , physicalResolution( physicalResolution_ ) + , supportedTransforms( supportedTransforms_ ) + , planeReorderPossible( planeReorderPossible_ ) + , persistentContent( persistentContent_ ) { - display = display_; - displayName = displayName_; - physicalDimensions = physicalDimensions_; - physicalResolution = physicalResolution_; - supportedTransforms = supportedTransforms_; - planeReorderPossible = planeReorderPossible_; - persistentContent = persistentContent_; } DisplayPropertiesKHR( VkDisplayPropertiesKHR const & rhs ) @@ -12521,22 +12105,18 @@ namespace vk struct DisplaySurfaceCreateInfoKHR { - DisplaySurfaceCreateInfoKHR() - : DisplaySurfaceCreateInfoKHR( DisplaySurfaceCreateFlagsKHR(), DisplayModeKHR(), 0, 0, SurfaceTransformFlagBitsKHR::eIdentity, 0, DisplayPlaneAlphaFlagBitsKHR::eOpaque, Extent2D() ) - {} - - DisplaySurfaceCreateInfoKHR( DisplaySurfaceCreateFlagsKHR flags_, DisplayModeKHR displayMode_, uint32_t planeIndex_, uint32_t planeStackIndex_, SurfaceTransformFlagBitsKHR transform_, float globalAlpha_, DisplayPlaneAlphaFlagBitsKHR alphaMode_, Extent2D imageExtent_ ) + DisplaySurfaceCreateInfoKHR( DisplaySurfaceCreateFlagsKHR flags_ = DisplaySurfaceCreateFlagsKHR(), DisplayModeKHR displayMode_ = DisplayModeKHR(), uint32_t planeIndex_ = 0, uint32_t planeStackIndex_ = 0, SurfaceTransformFlagBitsKHR transform_ = SurfaceTransformFlagBitsKHR::eIdentity, float globalAlpha_ = 0, DisplayPlaneAlphaFlagBitsKHR alphaMode_ = DisplayPlaneAlphaFlagBitsKHR::eOpaque, Extent2D imageExtent_ = Extent2D() ) + : sType( StructureType::eDisplaySurfaceCreateInfoKHR ) + , pNext( nullptr ) + , flags( flags_ ) + , displayMode( displayMode_ ) + , planeIndex( planeIndex_ ) + , planeStackIndex( planeStackIndex_ ) + , transform( transform_ ) + , globalAlpha( globalAlpha_ ) + , alphaMode( alphaMode_ ) + , imageExtent( imageExtent_ ) { - sType = StructureType::eDisplaySurfaceCreateInfoKHR; - pNext = nullptr; - flags = flags_; - displayMode = displayMode_; - planeIndex = planeIndex_; - planeStackIndex = planeStackIndex_; - transform = transform_; - globalAlpha = globalAlpha_; - alphaMode = alphaMode_; - imageExtent = imageExtent_; } DisplaySurfaceCreateInfoKHR( VkDisplaySurfaceCreateInfoKHR const & rhs ) @@ -12630,22 +12210,18 @@ namespace vk struct SurfaceCapabilitiesKHR { - SurfaceCapabilitiesKHR() - : SurfaceCapabilitiesKHR( 0, 0, Extent2D(), Extent2D(), Extent2D(), 0, SurfaceTransformFlagsKHR(), SurfaceTransformFlagBitsKHR::eIdentity, CompositeAlphaFlagsKHR(), ImageUsageFlags() ) - {} - - SurfaceCapabilitiesKHR( uint32_t minImageCount_, uint32_t maxImageCount_, Extent2D currentExtent_, Extent2D minImageExtent_, Extent2D maxImageExtent_, uint32_t maxImageArrayLayers_, SurfaceTransformFlagsKHR supportedTransforms_, SurfaceTransformFlagBitsKHR currentTransform_, CompositeAlphaFlagsKHR supportedCompositeAlpha_, ImageUsageFlags supportedUsageFlags_ ) + SurfaceCapabilitiesKHR( uint32_t minImageCount_ = 0, uint32_t maxImageCount_ = 0, Extent2D currentExtent_ = Extent2D(), Extent2D minImageExtent_ = Extent2D(), Extent2D maxImageExtent_ = Extent2D(), uint32_t maxImageArrayLayers_ = 0, SurfaceTransformFlagsKHR supportedTransforms_ = SurfaceTransformFlagsKHR(), SurfaceTransformFlagBitsKHR currentTransform_ = SurfaceTransformFlagBitsKHR::eIdentity, CompositeAlphaFlagsKHR supportedCompositeAlpha_ = CompositeAlphaFlagsKHR(), ImageUsageFlags supportedUsageFlags_ = ImageUsageFlags() ) + : minImageCount( minImageCount_ ) + , maxImageCount( maxImageCount_ ) + , currentExtent( currentExtent_ ) + , minImageExtent( minImageExtent_ ) + , maxImageExtent( maxImageExtent_ ) + , maxImageArrayLayers( maxImageArrayLayers_ ) + , supportedTransforms( supportedTransforms_ ) + , currentTransform( currentTransform_ ) + , supportedCompositeAlpha( supportedCompositeAlpha_ ) + , supportedUsageFlags( supportedUsageFlags_ ) { - minImageCount = minImageCount_; - maxImageCount = maxImageCount_; - currentExtent = currentExtent_; - minImageExtent = minImageExtent_; - maxImageExtent = maxImageExtent_; - maxImageArrayLayers = maxImageArrayLayers_; - supportedTransforms = supportedTransforms_; - currentTransform = currentTransform_; - supportedCompositeAlpha = supportedCompositeAlpha_; - supportedUsageFlags = supportedUsageFlags_; } SurfaceCapabilitiesKHR( VkSurfaceCapabilitiesKHR const & rhs ) @@ -12739,30 +12315,26 @@ namespace vk struct SwapchainCreateInfoKHR { - SwapchainCreateInfoKHR() - : SwapchainCreateInfoKHR( SwapchainCreateFlagsKHR(), SurfaceKHR(), 0, Format::eUndefined, ColorSpaceKHR::eVkColorspaceSrgbNonlinear, Extent2D(), 0, ImageUsageFlags(), SharingMode::eExclusive, 0, nullptr, SurfaceTransformFlagBitsKHR::eIdentity, CompositeAlphaFlagBitsKHR::eOpaque, PresentModeKHR::eImmediate, 0, SwapchainKHR() ) - {} - - SwapchainCreateInfoKHR( SwapchainCreateFlagsKHR flags_, SurfaceKHR surface_, uint32_t minImageCount_, Format imageFormat_, ColorSpaceKHR imageColorSpace_, Extent2D imageExtent_, uint32_t imageArrayLayers_, ImageUsageFlags imageUsage_, SharingMode imageSharingMode_, uint32_t queueFamilyIndexCount_, const uint32_t* pQueueFamilyIndices_, SurfaceTransformFlagBitsKHR preTransform_, CompositeAlphaFlagBitsKHR compositeAlpha_, PresentModeKHR presentMode_, Bool32 clipped_, SwapchainKHR oldSwapchain_ ) + SwapchainCreateInfoKHR( SwapchainCreateFlagsKHR flags_ = SwapchainCreateFlagsKHR(), SurfaceKHR surface_ = SurfaceKHR(), uint32_t minImageCount_ = 0, Format imageFormat_ = Format::eUndefined, ColorSpaceKHR imageColorSpace_ = ColorSpaceKHR::eVkColorspaceSrgbNonlinear, Extent2D imageExtent_ = Extent2D(), uint32_t imageArrayLayers_ = 0, ImageUsageFlags imageUsage_ = ImageUsageFlags(), SharingMode imageSharingMode_ = SharingMode::eExclusive, uint32_t queueFamilyIndexCount_ = 0, const uint32_t* pQueueFamilyIndices_ = nullptr, SurfaceTransformFlagBitsKHR preTransform_ = SurfaceTransformFlagBitsKHR::eIdentity, CompositeAlphaFlagBitsKHR compositeAlpha_ = CompositeAlphaFlagBitsKHR::eOpaque, PresentModeKHR presentMode_ = PresentModeKHR::eImmediate, Bool32 clipped_ = 0, SwapchainKHR oldSwapchain_ = SwapchainKHR() ) + : sType( StructureType::eSwapchainCreateInfoKHR ) + , pNext( nullptr ) + , flags( flags_ ) + , surface( surface_ ) + , minImageCount( minImageCount_ ) + , imageFormat( imageFormat_ ) + , imageColorSpace( imageColorSpace_ ) + , imageExtent( imageExtent_ ) + , imageArrayLayers( imageArrayLayers_ ) + , imageUsage( imageUsage_ ) + , imageSharingMode( imageSharingMode_ ) + , queueFamilyIndexCount( queueFamilyIndexCount_ ) + , pQueueFamilyIndices( pQueueFamilyIndices_ ) + , preTransform( preTransform_ ) + , compositeAlpha( compositeAlpha_ ) + , presentMode( presentMode_ ) + , clipped( clipped_ ) + , oldSwapchain( oldSwapchain_ ) { - sType = StructureType::eSwapchainCreateInfoKHR; - pNext = nullptr; - flags = flags_; - surface = surface_; - minImageCount = minImageCount_; - imageFormat = imageFormat_; - imageColorSpace = imageColorSpace_; - imageExtent = imageExtent_; - imageArrayLayers = imageArrayLayers_; - imageUsage = imageUsage_; - imageSharingMode = imageSharingMode_; - queueFamilyIndexCount = queueFamilyIndexCount_; - pQueueFamilyIndices = pQueueFamilyIndices_; - preTransform = preTransform_; - compositeAlpha = compositeAlpha_; - presentMode = presentMode_; - clipped = clipped_; - oldSwapchain = oldSwapchain_; } SwapchainCreateInfoKHR( VkSwapchainCreateInfoKHR const & rhs ) @@ -14518,13 +14090,13 @@ namespace vk struct DebugReportCallbackCreateInfoEXT { - DebugReportCallbackCreateInfoEXT( DebugReportFlagsEXT flags_, PFN_vkDebugReportCallbackEXT pfnCallback_, void* pUserData_ ) + DebugReportCallbackCreateInfoEXT( DebugReportFlagsEXT flags_ = DebugReportFlagsEXT(), PFN_vkDebugReportCallbackEXT pfnCallback_ = nullptr, void* pUserData_ = nullptr ) + : sType( StructureType::eDebugReportCallbackCreateInfoEXT ) + , pNext( nullptr ) + , flags( flags_ ) + , pfnCallback( pfnCallback_ ) + , pUserData( pUserData_ ) { - sType = StructureType::eDebugReportCallbackCreateInfoEXT; - pNext = nullptr; - flags = flags_; - pfnCallback = pfnCallback_; - pUserData = pUserData_; } DebugReportCallbackCreateInfoEXT( VkDebugReportCallbackCreateInfoEXT const & rhs )