diff --git a/RAII_Samples/06_InitDepthBuffer/06_InitDepthBuffer.cpp b/RAII_Samples/06_InitDepthBuffer/06_InitDepthBuffer.cpp index e1200e7..cbb2f39 100644 --- a/RAII_Samples/06_InitDepthBuffer/06_InitDepthBuffer.cpp +++ b/RAII_Samples/06_InitDepthBuffer/06_InitDepthBuffer.cpp @@ -37,7 +37,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); diff --git a/RAII_Samples/10_InitRenderPass/10_InitRenderPass.cpp b/RAII_Samples/10_InitRenderPass/10_InitRenderPass.cpp index efe183a..57eb586 100644 --- a/RAII_Samples/10_InitRenderPass/10_InitRenderPass.cpp +++ b/RAII_Samples/10_InitRenderPass/10_InitRenderPass.cpp @@ -49,12 +49,12 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::Format depthFormat = vk::Format::eD16Unorm; /* VULKAN_HPP_KEY_START */ diff --git a/RAII_Samples/12_InitFrameBuffers/12_InitFrameBuffers.cpp b/RAII_Samples/12_InitFrameBuffers/12_InitFrameBuffers.cpp index efff6f5..9b402ff 100644 --- a/RAII_Samples/12_InitFrameBuffers/12_InitFrameBuffers.cpp +++ b/RAII_Samples/12_InitFrameBuffers/12_InitFrameBuffers.cpp @@ -37,13 +37,13 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 64, 64 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -59,7 +59,7 @@ int main( int /*argc*/, char ** /*argv*/ ) /* VULKAN_KEY_START */ std::array attachments; - attachments[1] = **depthBufferData.pImageView; + attachments[1] = *depthBufferData.imageView; std::vector framebuffers; framebuffers.reserve( swapChainData.imageViews.size() ); diff --git a/RAII_Samples/13_InitVertexBuffer/13_InitVertexBuffer.cpp b/RAII_Samples/13_InitVertexBuffer/13_InitVertexBuffer.cpp index f9792b8..3ec88cd 100644 --- a/RAII_Samples/13_InitVertexBuffer/13_InitVertexBuffer.cpp +++ b/RAII_Samples/13_InitVertexBuffer/13_InitVertexBuffer.cpp @@ -48,7 +48,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 64, 64 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -60,7 +60,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -74,7 +74,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::makeRenderPass( device, swapChainData.colorFormat, depthBufferData.format ); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, surfaceData.extent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, surfaceData.extent ); /* VULKAN_KEY_START */ @@ -104,7 +104,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); diff --git a/RAII_Samples/14_InitPipeline/14_InitPipeline.cpp b/RAII_Samples/14_InitPipeline/14_InitPipeline.cpp index 57ac3a2..bcfdc7a 100644 --- a/RAII_Samples/14_InitPipeline/14_InitPipeline.cpp +++ b/RAII_Samples/14_InitPipeline/14_InitPipeline.cpp @@ -51,12 +51,12 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, vk::Format::eD16Unorm ); vk::raii::DescriptorSetLayout descriptorSetLayout = vk::raii::su::makeDescriptorSetLayout( diff --git a/RAII_Samples/15_DrawCube/15_DrawCube.cpp b/RAII_Samples/15_DrawCube/15_DrawCube.cpp index 3770473..ac4d7c4 100644 --- a/RAII_Samples/15_DrawCube/15_DrawCube.cpp +++ b/RAII_Samples/15_DrawCube/15_DrawCube.cpp @@ -52,7 +52,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -65,7 +65,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -85,7 +85,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::PipelineLayout pipelineLayout( device, { {}, *descriptorSetLayout } ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, depthBufferData.format ); glslang::InitializeProcess(); @@ -96,7 +96,7 @@ int main( int /*argc*/, char ** /*argv*/ ) glslang::FinalizeProcess(); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, surfaceData.extent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, surfaceData.extent ); vk::raii::su::BufferData vertexBufferData( physicalDevice, device, sizeof( coloredCubeData ), vk::BufferUsageFlagBits::eVertexBuffer ); @@ -133,7 +133,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -172,7 +172,7 @@ int main( int /*argc*/, char ** /*argv*/ ) while ( vk::Result::eTimeout == device.waitForFences( { *drawFence }, VK_TRUE, vk::su::FenceTimeout ) ) ; - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/CopyBlitImage/CopyBlitImage.cpp b/RAII_Samples/CopyBlitImage/CopyBlitImage.cpp index e5ab34f..666cd0f 100644 --- a/RAII_Samples/CopyBlitImage/CopyBlitImage.cpp +++ b/RAII_Samples/CopyBlitImage/CopyBlitImage.cpp @@ -36,7 +36,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 640, 640 ) ); - vk::SurfaceCapabilitiesKHR surfaceCapabilities = physicalDevice.getSurfaceCapabilitiesKHR( **surfaceData.pSurface ); + vk::SurfaceCapabilitiesKHR surfaceCapabilities = physicalDevice.getSurfaceCapabilitiesKHR( *surfaceData.surface ); if ( !( surfaceCapabilities.supportedUsageFlags & vk::ImageUsageFlagBits::eTransferDst ) ) { std::cout << "Surface cannot be destination of blit - abort \n"; @@ -44,7 +44,7 @@ int main( int /*argc*/, char ** /*argv*/ ) } std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -57,7 +57,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc | @@ -79,7 +79,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -227,7 +227,7 @@ int main( int /*argc*/, char ** /*argv*/ ) ; /* Now present the image in the window */ - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/DrawTexturedCube/DrawTexturedCube.cpp b/RAII_Samples/DrawTexturedCube/DrawTexturedCube.cpp index 57773fe..f4a8663 100644 --- a/RAII_Samples/DrawTexturedCube/DrawTexturedCube.cpp +++ b/RAII_Samples/DrawTexturedCube/DrawTexturedCube.cpp @@ -43,7 +43,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -56,7 +56,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -83,7 +83,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::PipelineLayout pipelineLayout( device, { {}, *descriptorSetLayout } ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, depthBufferData.format ); glslang::InitializeProcess(); @@ -94,7 +94,7 @@ int main( int /*argc*/, char ** /*argv*/ ) glslang::FinalizeProcess(); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, surfaceData.extent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, surfaceData.extent ); vk::raii::su::BufferData vertexBufferData( physicalDevice, device, sizeof( texturedCubeData ), vk::BufferUsageFlagBits::eVertexBuffer ); @@ -133,7 +133,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -173,7 +173,7 @@ int main( int /*argc*/, char ** /*argv*/ ) while ( vk::Result::eTimeout == device.waitForFences( { *drawFence }, VK_TRUE, vk::su::FenceTimeout ) ) ; - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/DynamicUniform/DynamicUniform.cpp b/RAII_Samples/DynamicUniform/DynamicUniform.cpp index cb9d383..0861db7 100644 --- a/RAII_Samples/DynamicUniform/DynamicUniform.cpp +++ b/RAII_Samples/DynamicUniform/DynamicUniform.cpp @@ -47,7 +47,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -60,7 +60,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -71,7 +71,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::DepthBufferData depthBufferData( physicalDevice, device, vk::Format::eD16Unorm, surfaceData.extent ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, depthBufferData.format ); glslang::InitializeProcess(); @@ -82,7 +82,7 @@ int main( int /*argc*/, char ** /*argv*/ ) glslang::FinalizeProcess(); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, surfaceData.extent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, surfaceData.extent ); vk::raii::su::BufferData vertexBufferData( physicalDevice, device, sizeof( coloredCubeData ), vk::BufferUsageFlagBits::eVertexBuffer ); @@ -160,7 +160,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -209,7 +209,7 @@ int main( int /*argc*/, char ** /*argv*/ ) while ( vk::Result::eTimeout == device.waitForFences( { *drawFence }, VK_TRUE, vk::su::FenceTimeout ) ) ; - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/ImmutableSampler/ImmutableSampler.cpp b/RAII_Samples/ImmutableSampler/ImmutableSampler.cpp index 10a85a7..1abe7b1 100644 --- a/RAII_Samples/ImmutableSampler/ImmutableSampler.cpp +++ b/RAII_Samples/ImmutableSampler/ImmutableSampler.cpp @@ -55,7 +55,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -68,7 +68,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -84,7 +84,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::copyToDevice( uniformBufferData.deviceMemory, mvpcMatrix ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, depthBufferData.format ); glslang::InitializeProcess(); @@ -95,7 +95,7 @@ int main( int /*argc*/, char ** /*argv*/ ) glslang::FinalizeProcess(); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, surfaceData.extent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, surfaceData.extent ); vk::raii::su::BufferData vertexBufferData( physicalDevice, device, sizeof( texturedCubeData ), vk::BufferUsageFlagBits::eVertexBuffer ); @@ -136,7 +136,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::DescriptorBufferInfo bufferInfo( *uniformBufferData.buffer, 0, sizeof( glm::mat4x4 ) ); vk::DescriptorImageInfo imageInfo( - *textureData.sampler, **textureData.pImageData->pImageView, vk::ImageLayout::eShaderReadOnlyOptimal ); + *textureData.sampler, *textureData.imageData.imageView, vk::ImageLayout::eShaderReadOnlyOptimal ); std::array writeDescriptorSets = { vk::WriteDescriptorSet( *descriptorSet, 0, 0, vk::DescriptorType::eUniformBuffer, {}, bufferInfo ), vk::WriteDescriptorSet( *descriptorSet, 1, 0, vk::DescriptorType::eCombinedImageSampler, imageInfo ) @@ -164,7 +164,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -194,7 +194,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::submitAndWait( device, graphicsQueue, commandBuffer ); - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/InitTexture/InitTexture.cpp b/RAII_Samples/InitTexture/InitTexture.cpp index e51aaac..e31b013 100644 --- a/RAII_Samples/InitTexture/InitTexture.cpp +++ b/RAII_Samples/InitTexture/InitTexture.cpp @@ -52,7 +52,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 50, 50 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -101,27 +101,27 @@ int main( int /*argc*/, char ** /*argv*/ ) // bind memory image.bindMemory( *imageMemory, 0 ); - std::unique_ptr pTextureBuffer; - std::unique_ptr pTextureBufferMemory; + vk::raii::Buffer textureBuffer = nullptr; + vk::raii::DeviceMemory textureBufferMemory = nullptr; if ( needsStaging ) { // Need a staging buffer to map and copy texture into vk::BufferCreateInfo bufferCreateInfo( {}, surfaceData.extent.width * surfaceData.extent.height * 4, vk::BufferUsageFlagBits::eTransferSrc ); - pTextureBuffer = vk::raii::su::make_unique( device, bufferCreateInfo ); + textureBuffer = vk::raii::Buffer( device, bufferCreateInfo ); - memoryRequirements = pTextureBuffer->getMemoryRequirements(); + memoryRequirements = textureBuffer.getMemoryRequirements(); memoryTypeIndex = vk::su::findMemoryType( physicalDevice.getMemoryProperties(), memoryRequirements.memoryTypeBits, vk::MemoryPropertyFlagBits::eHostVisible | vk::MemoryPropertyFlagBits::eHostCoherent ); // allocate memory - memoryAllocateInfo = vk::MemoryAllocateInfo( memoryRequirements.size, memoryTypeIndex ); - pTextureBufferMemory = vk::raii::su::make_unique( device, memoryAllocateInfo ); + memoryAllocateInfo = vk::MemoryAllocateInfo( memoryRequirements.size, memoryTypeIndex ); + textureBufferMemory = vk::raii::DeviceMemory( device, memoryAllocateInfo ); // bind memory - pTextureBuffer->bindMemory( **pTextureBufferMemory, 0 ); + textureBuffer.bindMemory( *textureBufferMemory, 0 ); } else { @@ -129,7 +129,7 @@ int main( int /*argc*/, char ** /*argv*/ ) image.getSubresourceLayout( vk::ImageSubresource( vk::ImageAspectFlagBits::eColor ) ); } - void * data = needsStaging ? pTextureBufferMemory->mapMemory( 0, memoryRequirements.size, vk::MemoryMapFlags() ) + void * data = needsStaging ? textureBufferMemory.mapMemory( 0, memoryRequirements.size, vk::MemoryMapFlags() ) : imageMemory.mapMemory( 0, memoryRequirements.size, vk::MemoryMapFlags() ); // Checkerboard of 16x16 pixel squares @@ -147,7 +147,7 @@ int main( int /*argc*/, char ** /*argv*/ ) } } - needsStaging ? pTextureBufferMemory->unmapMemory() : imageMemory.unmapMemory(); + needsStaging ? textureBufferMemory.unmapMemory() : imageMemory.unmapMemory(); commandBuffer.begin( vk::CommandBufferBeginInfo() ); if ( needsStaging ) @@ -161,7 +161,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::ImageSubresourceLayers( vk::ImageAspectFlagBits::eColor, 0, 0, 1 ), vk::Offset3D( 0, 0, 0 ), vk::Extent3D( surfaceData.extent, 1 ) ); - commandBuffer.copyBufferToImage( **pTextureBuffer, *image, vk::ImageLayout::eTransferDstOptimal, copyRegion ); + commandBuffer.copyBufferToImage( *textureBuffer, *image, vk::ImageLayout::eTransferDstOptimal, copyRegion ); // Set the layout for the texture image from eTransferDstOptimal to SHADER_READ_ONLY vk::raii::su::setImageLayout( commandBuffer, *image, format, vk::ImageLayout::eTransferDstOptimal, vk::ImageLayout::eShaderReadOnlyOptimal ); diff --git a/RAII_Samples/InputAttachment/InputAttachment.cpp b/RAII_Samples/InputAttachment/InputAttachment.cpp index 049ee7d..2ca471c 100644 --- a/RAII_Samples/InputAttachment/InputAttachment.cpp +++ b/RAII_Samples/InputAttachment/InputAttachment.cpp @@ -88,7 +88,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -101,7 +101,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -245,7 +245,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -275,7 +275,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::submitAndWait( device, graphicsQueue, commandBuffer ); - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/MultipleSets/MultipleSets.cpp b/RAII_Samples/MultipleSets/MultipleSets.cpp index 7271cf4..14380ca 100644 --- a/RAII_Samples/MultipleSets/MultipleSets.cpp +++ b/RAII_Samples/MultipleSets/MultipleSets.cpp @@ -112,7 +112,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -125,7 +125,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -146,7 +146,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::copyToDevice( uniformBufferData.deviceMemory, mvpcMatrix ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, depthBufferData.format ); glslang::InitializeProcess(); @@ -157,7 +157,7 @@ int main( int /*argc*/, char ** /*argv*/ ) glslang::FinalizeProcess(); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, surfaceData.extent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, surfaceData.extent ); vk::raii::su::BufferData vertexBufferData( physicalDevice, device, sizeof( texturedCubeData ), vk::BufferUsageFlagBits::eVertexBuffer ); @@ -198,7 +198,7 @@ int main( int /*argc*/, char ** /*argv*/ ) // Populate with info about our uniform buffer vk::DescriptorBufferInfo uniformBufferInfo( *uniformBufferData.buffer, 0, sizeof( glm::mat4x4 ) ); vk::DescriptorImageInfo textureImageInfo( - *textureData.sampler, **textureData.pImageData->pImageView, vk::ImageLayout::eShaderReadOnlyOptimal ); + *textureData.sampler, *textureData.imageData.imageView, vk::ImageLayout::eShaderReadOnlyOptimal ); std::array writeDescriptorSets = { { vk::WriteDescriptorSet( *descriptorSets[0], 0, 0, vk::DescriptorType::eUniformBuffer, {}, uniformBufferInfo ), vk::WriteDescriptorSet( @@ -228,7 +228,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -266,7 +266,7 @@ int main( int /*argc*/, char ** /*argv*/ ) while ( vk::Result::eTimeout == device.waitForFences( { *drawFence }, VK_TRUE, vk::su::FenceTimeout ) ) ; - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/OcclusionQuery/OcclusionQuery.cpp b/RAII_Samples/OcclusionQuery/OcclusionQuery.cpp index 12306f7..fd4f37a 100644 --- a/RAII_Samples/OcclusionQuery/OcclusionQuery.cpp +++ b/RAII_Samples/OcclusionQuery/OcclusionQuery.cpp @@ -50,7 +50,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -63,7 +63,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -83,7 +83,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::PipelineLayout pipelineLayout( device, { {}, *descriptorSetLayout } ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, depthBufferData.format ); glslang::InitializeProcess(); @@ -94,7 +94,7 @@ int main( int /*argc*/, char ** /*argv*/ ) glslang::FinalizeProcess(); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, surfaceData.extent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, surfaceData.extent ); vk::raii::su::BufferData vertexBufferData( physicalDevice, device, sizeof( coloredCubeData ), vk::BufferUsageFlagBits::eVertexBuffer ); @@ -132,7 +132,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -232,7 +232,7 @@ int main( int /*argc*/, char ** /*argv*/ ) while ( vk::Result::eTimeout == device.waitForFences( { *drawFence }, VK_TRUE, vk::su::FenceTimeout ) ) ; - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/PipelineCache/PipelineCache.cpp b/RAII_Samples/PipelineCache/PipelineCache.cpp index e3f6790..07c9c03 100644 --- a/RAII_Samples/PipelineCache/PipelineCache.cpp +++ b/RAII_Samples/PipelineCache/PipelineCache.cpp @@ -84,7 +84,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -97,7 +97,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -124,7 +124,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::PipelineLayout pipelineLayout( device, { {}, *descriptorSetLayout } ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, depthBufferData.format ); glslang::InitializeProcess(); @@ -135,7 +135,7 @@ int main( int /*argc*/, char ** /*argv*/ ) glslang::FinalizeProcess(); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, surfaceData.extent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, surfaceData.extent ); vk::raii::su::BufferData vertexBufferData( physicalDevice, device, sizeof( texturedCubeData ), vk::BufferUsageFlagBits::eVertexBuffer ); @@ -316,7 +316,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -354,7 +354,7 @@ int main( int /*argc*/, char ** /*argv*/ ) while ( vk::Result::eTimeout == device.waitForFences( { *drawFence }, VK_TRUE, vk::su::FenceTimeout ) ) ; - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/PipelineDerivative/PipelineDerivative.cpp b/RAII_Samples/PipelineDerivative/PipelineDerivative.cpp index 804f4b2..bdb3c5c 100644 --- a/RAII_Samples/PipelineDerivative/PipelineDerivative.cpp +++ b/RAII_Samples/PipelineDerivative/PipelineDerivative.cpp @@ -51,7 +51,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -64,7 +64,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -91,7 +91,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::PipelineLayout pipelineLayout( device, { {}, *descriptorSetLayout } ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, depthBufferData.format ); glslang::InitializeProcess(); @@ -102,7 +102,7 @@ int main( int /*argc*/, char ** /*argv*/ ) glslang::FinalizeProcess(); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, surfaceData.extent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, surfaceData.extent ); vk::raii::su::BufferData vertexBufferData( physicalDevice, device, sizeof( texturedCubeData ), vk::BufferUsageFlagBits::eVertexBuffer ); @@ -252,7 +252,7 @@ void main() vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -290,7 +290,7 @@ void main() while ( vk::Result::eTimeout == device.waitForFences( { *drawFence }, VK_TRUE, vk::su::FenceTimeout ) ) ; - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/PushConstants/PushConstants.cpp b/RAII_Samples/PushConstants/PushConstants.cpp index 564e884..e04864c 100644 --- a/RAII_Samples/PushConstants/PushConstants.cpp +++ b/RAII_Samples/PushConstants/PushConstants.cpp @@ -93,7 +93,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -106,7 +106,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -122,7 +122,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::copyToDevice( uniformBufferData.deviceMemory, mvpcMatrix ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, depthBufferData.format ); glslang::InitializeProcess(); @@ -133,7 +133,7 @@ int main( int /*argc*/, char ** /*argv*/ ) glslang::FinalizeProcess(); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, surfaceData.extent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, surfaceData.extent ); vk::raii::su::BufferData vertexBufferData( physicalDevice, device, sizeof( texturedCubeData ), vk::BufferUsageFlagBits::eVertexBuffer ); @@ -201,7 +201,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -239,7 +239,7 @@ int main( int /*argc*/, char ** /*argv*/ ) while ( vk::Result::eTimeout == device.waitForFences( { *drawFence }, VK_TRUE, vk::su::FenceTimeout ) ) ; - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/PushDescriptors/PushDescriptors.cpp b/RAII_Samples/PushDescriptors/PushDescriptors.cpp index 8e55a92..1dbafc2 100644 --- a/RAII_Samples/PushDescriptors/PushDescriptors.cpp +++ b/RAII_Samples/PushDescriptors/PushDescriptors.cpp @@ -77,7 +77,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, deviceExtensions ); @@ -91,7 +91,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -121,7 +121,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::PipelineLayout pipelineLayout( device, { {}, *descriptorSetLayout } ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, depthBufferData.format ); @@ -133,7 +133,7 @@ int main( int /*argc*/, char ** /*argv*/ ) glslang::FinalizeProcess(); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, surfaceData.extent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, surfaceData.extent ); vk::raii::su::BufferData vertexBufferData( physicalDevice, device, sizeof( texturedCubeData ), vk::BufferUsageFlagBits::eVertexBuffer ); @@ -160,7 +160,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -174,7 +174,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::DescriptorBufferInfo bufferInfo( *uniformBufferData.buffer, 0, sizeof( glm::mat4x4 ) ); vk::DescriptorImageInfo imageInfo( - *textureData.sampler, **textureData.pImageData->pImageView, vk::ImageLayout::eShaderReadOnlyOptimal ); + *textureData.sampler, *textureData.imageData.imageView, vk::ImageLayout::eShaderReadOnlyOptimal ); vk::WriteDescriptorSet writeDescriptorSets[2] = { vk::WriteDescriptorSet( {}, 0, 0, vk::DescriptorType::eUniformBuffer, {}, bufferInfo ), vk::WriteDescriptorSet( {}, 1, 0, vk::DescriptorType::eCombinedImageSampler, imageInfo ) @@ -207,7 +207,7 @@ int main( int /*argc*/, char ** /*argv*/ ) while ( vk::Result::eTimeout == device.waitForFences( { *drawFence }, VK_TRUE, vk::su::FenceTimeout ) ) ; - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/RayTracing/RayTracing.cpp b/RAII_Samples/RayTracing/RayTracing.cpp index 3cb6408..ba1d99f 100644 --- a/RAII_Samples/RayTracing/RayTracing.cpp +++ b/RAII_Samples/RayTracing/RayTracing.cpp @@ -81,18 +81,18 @@ static_assert( sizeof( GeometryInstanceData ) == 64, "GeometryInstanceData struc struct AccelerationStructureData { - std::shared_ptr pAcclerationStructure; - std::unique_ptr pScratchBufferData; - std::unique_ptr pResultBufferData; - std::unique_ptr pInstanceBufferData; + vk::raii::AccelerationStructureNV acclerationStructure = nullptr; + vk::raii::su::BufferData scratchBufferData = nullptr; + vk::raii::su::BufferData resultBufferData = nullptr; + vk::raii::su::BufferData instanceBufferData = nullptr; }; AccelerationStructureData createAccelerationStructureData( - vk::raii::PhysicalDevice const & physicalDevice, - vk::raii::Device const & device, - vk::raii::CommandBuffer const & commandBuffer, - std::vector, glm::mat4x4>> const & instances, - std::vector const & geometries ) + vk::raii::PhysicalDevice const & physicalDevice, + vk::raii::Device const & device, + vk::raii::CommandBuffer const & commandBuffer, + std::vector> const & instances, + std::vector const & geometries ) { assert( instances.empty() ^ geometries.empty() ); @@ -103,51 +103,48 @@ AccelerationStructureData createAccelerationStructureData( vk::AccelerationStructureInfoNV accelerationStructureInfo( accelerationStructureType, {}, vk::su::checked_cast( instances.size() ), geometries ); vk::AccelerationStructureCreateInfoNV accelerationStructureCreateInfoNV( 0, accelerationStructureInfo ); - accelerationStructureData.pAcclerationStructure = - std::make_shared( device, accelerationStructureCreateInfoNV ); + accelerationStructureData.acclerationStructure = + vk::raii::AccelerationStructureNV( device, accelerationStructureCreateInfoNV ); vk::AccelerationStructureMemoryRequirementsInfoNV objectRequirements( - vk::AccelerationStructureMemoryRequirementsTypeNV::eObject, **accelerationStructureData.pAcclerationStructure ); + vk::AccelerationStructureMemoryRequirementsTypeNV::eObject, *accelerationStructureData.acclerationStructure ); vk::DeviceSize resultSizeInBytes = device.getAccelerationStructureMemoryRequirementsNV( objectRequirements ).memoryRequirements.size; assert( 0 < resultSizeInBytes ); - accelerationStructureData.pResultBufferData = - vk::raii::su::make_unique( physicalDevice, - device, - resultSizeInBytes, - vk::BufferUsageFlagBits::eRayTracingNV, - vk::MemoryPropertyFlagBits::eDeviceLocal ); + accelerationStructureData.resultBufferData = vk::raii::su::BufferData( physicalDevice, + device, + resultSizeInBytes, + vk::BufferUsageFlagBits::eRayTracingNV, + vk::MemoryPropertyFlagBits::eDeviceLocal ); vk::AccelerationStructureMemoryRequirementsInfoNV buildScratchRequirements( - vk::AccelerationStructureMemoryRequirementsTypeNV::eBuildScratch, - **accelerationStructureData.pAcclerationStructure ); + vk::AccelerationStructureMemoryRequirementsTypeNV::eBuildScratch, *accelerationStructureData.acclerationStructure ); vk::AccelerationStructureMemoryRequirementsInfoNV updateScratchRequirements( vk::AccelerationStructureMemoryRequirementsTypeNV::eUpdateScratch, - **accelerationStructureData.pAcclerationStructure ); + *accelerationStructureData.acclerationStructure ); vk::DeviceSize scratchSizeInBytes = std::max( device.getAccelerationStructureMemoryRequirementsNV( buildScratchRequirements ).memoryRequirements.size, device.getAccelerationStructureMemoryRequirementsNV( updateScratchRequirements ).memoryRequirements.size ); assert( 0 < scratchSizeInBytes ); - accelerationStructureData.pScratchBufferData = - vk::raii::su::make_unique( physicalDevice, - device, - scratchSizeInBytes, - vk::BufferUsageFlagBits::eRayTracingNV, - vk::MemoryPropertyFlagBits::eDeviceLocal ); + accelerationStructureData.scratchBufferData = vk::raii::su::BufferData( physicalDevice, + device, + scratchSizeInBytes, + vk::BufferUsageFlagBits::eRayTracingNV, + vk::MemoryPropertyFlagBits::eDeviceLocal ); if ( !instances.empty() ) { - accelerationStructureData.pInstanceBufferData = - vk::raii::su::make_unique( physicalDevice, - device, - instances.size() * sizeof( GeometryInstanceData ), - vk::BufferUsageFlagBits::eRayTracingNV ); + accelerationStructureData.instanceBufferData = + vk::raii::su::BufferData( physicalDevice, + device, + instances.size() * sizeof( GeometryInstanceData ), + vk::BufferUsageFlagBits::eRayTracingNV ); std::vector geometryInstanceData; for ( size_t i = 0; i < instances.size(); i++ ) { - uint64_t accelerationStructureHandle = instances[i].first->getHandle(); + uint64_t accelerationStructureHandle = instances[i].first.getHandle(); // For each instance we set its instance index to its index i in the instance vector, and set // its hit group index to 2*i. The hit group index defines which entry of the shader binding @@ -161,16 +158,16 @@ AccelerationStructureData createAccelerationStructureData( static_cast( vk::GeometryInstanceFlagBitsNV::eTriangleCullDisable ), accelerationStructureHandle ); } - accelerationStructureData.pInstanceBufferData->upload( geometryInstanceData ); + accelerationStructureData.instanceBufferData.upload( geometryInstanceData ); } device.bindAccelerationStructureMemoryNV( vk::BindAccelerationStructureMemoryInfoNV( - **accelerationStructureData.pAcclerationStructure, *accelerationStructureData.pResultBufferData->deviceMemory ) ); + *accelerationStructureData.acclerationStructure, *accelerationStructureData.resultBufferData.deviceMemory ) ); vk::Buffer instanceData; - if ( accelerationStructureData.pInstanceBufferData ) + if ( *accelerationStructureData.instanceBufferData.buffer ) { - instanceData = *accelerationStructureData.pInstanceBufferData->buffer; + instanceData = *accelerationStructureData.instanceBufferData.buffer; } vk::AccelerationStructureInfoNV accelerationStructureInfoNV( accelerationStructureType, {}, vk::su::checked_cast( instances.size() ), geometries ); @@ -178,9 +175,9 @@ AccelerationStructureData createAccelerationStructureData( instanceData, 0, false, - **accelerationStructureData.pAcclerationStructure, + *accelerationStructureData.acclerationStructure, nullptr, - *accelerationStructureData.pScratchBufferData->buffer, + *accelerationStructureData.scratchBufferData.buffer, 0 ); vk::MemoryBarrier memoryBarrier( @@ -788,7 +785,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::DepthBufferData depthBufferData( physicalDevice, device, depthFormat, windowExtent ); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, windowExtent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, windowExtent ); bool samplerAnisotropy = !!supportedFeatures.get().features.samplerAnisotropy; @@ -962,12 +959,12 @@ int main( int /*argc*/, char ** /*argv*/ ) {}, { vk::GeometryNV( vk::GeometryTypeNV::eTriangles, geometryDataNV ) } ); - topLevelAS = - createAccelerationStructureData( physicalDevice, - device, - commandBuffer, - { std::make_pair( bottomLevelAS.pAcclerationStructure, transform ) }, - std::vector() ); + topLevelAS = createAccelerationStructureData( + physicalDevice, + device, + commandBuffer, + { std::make_pair( std::ref( bottomLevelAS.acclerationStructure ), std::ref( transform ) ) }, + std::vector() ); } ); // create raytracing descriptor set @@ -1043,7 +1040,7 @@ int main( int /*argc*/, char ** /*argv*/ ) // Bind ray tracing specific descriptor sets into pNext of a vk::WriteDescriptorSet vk::WriteDescriptorSetAccelerationStructureNV writeDescriptorSetAcceleration( 1, - &**topLevelAS.pAcclerationStructure ); + &*topLevelAS.acclerationStructure ); std::vector accelerationDescriptionSets; for ( size_t i = 0; i < rayTracingDescriptorSets.size(); i++ ) { @@ -1211,7 +1208,7 @@ int main( int /*argc*/, char ** /*argv*/ ) surface, windowExtent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eStorage, - &*swapChainData.pSwapChain, + &swapChainData.swapChain, graphicsAndPresentQueueFamilyIndex.first, graphicsAndPresentQueueFamilyIndex.second ); depthBufferData = vk::raii::su::DepthBufferData( @@ -1229,7 +1226,7 @@ int main( int /*argc*/, char ** /*argv*/ ) } ); framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, windowExtent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, windowExtent ); } // update the uniformBufferObject @@ -1245,7 +1242,7 @@ int main( int /*argc*/, char ** /*argv*/ ) // frame begin vk::Result result; uint32_t backBufferIndex; - std::tie( result, backBufferIndex ) = swapChainData.pSwapChain->acquireNextImage( + std::tie( result, backBufferIndex ) = swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *perFrameData[frameIndex].presentCompleteSemaphore ); assert( result == vk::Result::eSuccess ); @@ -1337,7 +1334,7 @@ int main( int /*argc*/, char ** /*argv*/ ) &*perFrameData[frameIndex].renderCompleteSemaphore ); graphicsQueue.submit( submitInfo, *perFrameData[frameIndex].fence ); vk::PresentInfoKHR presentInfoKHR( - *perFrameData[frameIndex].renderCompleteSemaphore, **swapChainData.pSwapChain, backBufferIndex ); + *perFrameData[frameIndex].renderCompleteSemaphore, *swapChainData.swapChain, backBufferIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/SecondaryCommandBuffer/SecondaryCommandBuffer.cpp b/RAII_Samples/SecondaryCommandBuffer/SecondaryCommandBuffer.cpp index a156a8f..c5f9f4c 100644 --- a/RAII_Samples/SecondaryCommandBuffer/SecondaryCommandBuffer.cpp +++ b/RAII_Samples/SecondaryCommandBuffer/SecondaryCommandBuffer.cpp @@ -53,7 +53,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -66,7 +66,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -88,7 +88,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::PipelineLayout pipelineLayout( device, { {}, *descriptorSetLayout } ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, depthBufferData.format, @@ -103,7 +103,7 @@ int main( int /*argc*/, char ** /*argv*/ ) glslang::FinalizeProcess(); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, surfaceData.extent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, surfaceData.extent ); vk::raii::su::BufferData vertexBufferData( physicalDevice, device, sizeof( texturedCubeData ), vk::BufferUsageFlagBits::eVertexBuffer ); @@ -162,7 +162,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -239,7 +239,7 @@ int main( int /*argc*/, char ** /*argv*/ ) while ( vk::Result::eTimeout == device.waitForFences( { *drawFence }, VK_TRUE, vk::su::FenceTimeout ) ) ; - result = presentQueue.presentKHR( vk::PresentInfoKHR( {}, **swapChainData.pSwapChain, imageIndex, {} ) ); + result = presentQueue.presentKHR( vk::PresentInfoKHR( {}, *swapChainData.swapChain, imageIndex, {} ) ); switch ( result ) { case vk::Result::eSuccess: break; diff --git a/RAII_Samples/SeparateImageSampler/SeparateImageSampler.cpp b/RAII_Samples/SeparateImageSampler/SeparateImageSampler.cpp index 23ea455..986ecc5 100644 --- a/RAII_Samples/SeparateImageSampler/SeparateImageSampler.cpp +++ b/RAII_Samples/SeparateImageSampler/SeparateImageSampler.cpp @@ -81,7 +81,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -94,7 +94,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -110,7 +110,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::copyToDevice( uniformBufferData.deviceMemory, mvpcMatrix ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, depthBufferData.format ); glslang::InitializeProcess(); @@ -121,7 +121,7 @@ int main( int /*argc*/, char ** /*argv*/ ) glslang::FinalizeProcess(); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, surfaceData.extent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, surfaceData.extent ); vk::raii::su::BufferData vertexBufferData( physicalDevice, device, sizeof( texturedCubeData ), vk::BufferUsageFlagBits::eVertexBuffer ); @@ -187,7 +187,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::DescriptorBufferInfo bufferInfo( *uniformBufferData.buffer, 0, sizeof( glm::mat4x4 ) ); vk::DescriptorImageInfo imageInfo( - *textureData.sampler, **textureData.pImageData->pImageView, vk::ImageLayout::eShaderReadOnlyOptimal ); + *textureData.sampler, *textureData.imageData.imageView, vk::ImageLayout::eShaderReadOnlyOptimal ); vk::DescriptorImageInfo samplerInfo( *sampler, {}, {} ); std::array descriptorWrites = { { vk::WriteDescriptorSet( *descriptorSet, 0, 0, vk::DescriptorType::eUniformBuffer, {}, bufferInfo ), @@ -218,7 +218,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -257,7 +257,7 @@ int main( int /*argc*/, char ** /*argv*/ ) while ( vk::Result::eTimeout == device.waitForFences( { *drawFence }, VK_TRUE, vk::su::FenceTimeout ) ) ; - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/SurfaceCapabilities/SurfaceCapabilities.cpp b/RAII_Samples/SurfaceCapabilities/SurfaceCapabilities.cpp index 17df4e4..94252ba 100644 --- a/RAII_Samples/SurfaceCapabilities/SurfaceCapabilities.cpp +++ b/RAII_Samples/SurfaceCapabilities/SurfaceCapabilities.cpp @@ -102,7 +102,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::DisplayNativeHdrSurfaceCapabilitiesAMD, vk::SharedPresentSurfaceCapabilitiesKHR, vk::SurfaceCapabilitiesFullScreenExclusiveEXT, - vk::SurfaceProtectedCapabilitiesKHR>( { **surfaceData.pSurface } ); + vk::SurfaceProtectedCapabilitiesKHR>( { *surfaceData.surface } ); vk::SurfaceCapabilitiesKHR const & surfaceCapabilities = surfaceCapabilities2.get().surfaceCapabilities; @@ -153,7 +153,7 @@ int main( int /*argc*/, char ** /*argv*/ ) else { vk::SurfaceCapabilitiesKHR surfaceCapabilities = - physicalDevices[i].getSurfaceCapabilitiesKHR( **surfaceData.pSurface ); + physicalDevices[i].getSurfaceCapabilitiesKHR( *surfaceData.surface ); cout( surfaceCapabilities ); } } diff --git a/RAII_Samples/SurfaceFormats/SurfaceFormats.cpp b/RAII_Samples/SurfaceFormats/SurfaceFormats.cpp index f060f8d..9e10220 100644 --- a/RAII_Samples/SurfaceFormats/SurfaceFormats.cpp +++ b/RAII_Samples/SurfaceFormats/SurfaceFormats.cpp @@ -48,7 +48,7 @@ int main( int /*argc*/, char ** /*argv*/ ) { std::cout << "PhysicalDevice " << i << "\n"; std::vector surfaceFormats = - physicalDevices[i].getSurfaceFormatsKHR( **surfaceData.pSurface ); + physicalDevices[i].getSurfaceFormatsKHR( *surfaceData.surface ); for ( size_t j = 0; j < surfaceFormats.size(); j++ ) { std::cout << "\tFormat " << j << "\n"; diff --git a/RAII_Samples/Template/Template.cpp b/RAII_Samples/Template/Template.cpp index e7b6e5c..6670be2 100644 --- a/RAII_Samples/Template/Template.cpp +++ b/RAII_Samples/Template/Template.cpp @@ -43,7 +43,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -56,7 +56,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -83,7 +83,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::PipelineLayout pipelineLayout( device, { {}, *descriptorSetLayout } ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, depthBufferData.format ); glslang::InitializeProcess(); @@ -94,7 +94,7 @@ int main( int /*argc*/, char ** /*argv*/ ) glslang::FinalizeProcess(); std::vector framebuffers = vk::raii::su::makeFramebuffers( - device, renderPass, swapChainData.imageViews, &*depthBufferData.pImageView, surfaceData.extent ); + device, renderPass, swapChainData.imageViews, &depthBufferData.imageView, surfaceData.extent ); vk::raii::su::BufferData vertexBufferData( physicalDevice, device, sizeof( texturedCubeData ), vk::BufferUsageFlagBits::eVertexBuffer ); @@ -131,7 +131,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -169,7 +169,7 @@ int main( int /*argc*/, char ** /*argv*/ ) while ( vk::Result::eTimeout == device.waitForFences( { *drawFence }, VK_TRUE, vk::su::FenceTimeout ) ) ; - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/TexelBuffer/TexelBuffer.cpp b/RAII_Samples/TexelBuffer/TexelBuffer.cpp index 492382c..0ab1805 100644 --- a/RAII_Samples/TexelBuffer/TexelBuffer.cpp +++ b/RAII_Samples/TexelBuffer/TexelBuffer.cpp @@ -85,7 +85,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SurfaceData surfaceData( instance, AppName, vk::Extent2D( 500, 500 ) ); std::pair graphicsAndPresentQueueFamilyIndex = - vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, *surfaceData.pSurface ); + vk::raii::su::findGraphicsAndPresentQueueFamilyIndex( physicalDevice, surfaceData.surface ); vk::raii::Device device = vk::raii::su::makeDevice( physicalDevice, graphicsAndPresentQueueFamilyIndex.first, vk::su::getDeviceExtensions() ); @@ -98,7 +98,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::su::SwapChainData swapChainData( physicalDevice, device, - *surfaceData.pSurface, + surfaceData.surface, surfaceData.extent, vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc, @@ -118,7 +118,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::raii::PipelineLayout pipelineLayout( device, { {}, *descriptorSetLayout } ); vk::Format colorFormat = - vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( **surfaceData.pSurface ) ).format; + vk::su::pickSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surfaceData.surface ) ).format; vk::raii::RenderPass renderPass = vk::raii::su::makeRenderPass( device, colorFormat, vk::Format::eUndefined ); glslang::InitializeProcess(); @@ -163,7 +163,7 @@ int main( int /*argc*/, char ** /*argv*/ ) vk::Result result; uint32_t imageIndex; std::tie( result, imageIndex ) = - swapChainData.pSwapChain->acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); + swapChainData.swapChain.acquireNextImage( vk::su::FenceTimeout, *imageAcquiredSemaphore ); assert( result == vk::Result::eSuccess ); assert( imageIndex < swapChainData.images.size() ); @@ -201,7 +201,7 @@ int main( int /*argc*/, char ** /*argv*/ ) while ( vk::Result::eTimeout == device.waitForFences( { *drawFence }, VK_TRUE, vk::su::FenceTimeout ) ) ; - vk::PresentInfoKHR presentInfoKHR( nullptr, **swapChainData.pSwapChain, imageIndex ); + vk::PresentInfoKHR presentInfoKHR( nullptr, *swapChainData.swapChain, imageIndex ); result = presentQueue.presentKHR( presentInfoKHR ); switch ( result ) { diff --git a/RAII_Samples/utils/utils.hpp b/RAII_Samples/utils/utils.hpp index 339481c..b762c69 100644 --- a/RAII_Samples/utils/utils.hpp +++ b/RAII_Samples/utils/utils.hpp @@ -217,6 +217,8 @@ namespace vk buffer.bindMemory( *deviceMemory, 0 ); } + BufferData( std::nullptr_t ) {} + template void upload( DataType const & data ) const { @@ -270,8 +272,8 @@ namespace vk } // the order of buffer and deviceMemory here is important to get the constructor running ! - vk::raii::Buffer buffer; - vk::raii::DeviceMemory deviceMemory; + vk::raii::Buffer buffer = nullptr; + vk::raii::DeviceMemory deviceMemory = nullptr; #if !defined( NDEBUG ) private: vk::DeviceSize m_size; @@ -309,7 +311,7 @@ namespace vk device, physicalDevice.getMemoryProperties(), image.getMemoryRequirements(), memoryProperties ) ) { image.bindMemory( *deviceMemory, 0 ); - pImageView = vk::raii::su::make_unique( + imageView = vk::raii::ImageView( device, vk::ImageViewCreateInfo( {}, @@ -320,10 +322,12 @@ namespace vk { aspectMask, 0, 1, 0, 1 } ) ); } - vk::Format format; - vk::raii::Image image; - vk::raii::DeviceMemory deviceMemory; - std::unique_ptr pImageView; + ImageData( std::nullptr_t ) {} + + vk::Format format; + vk::raii::Image image = nullptr; + vk::raii::DeviceMemory deviceMemory = nullptr; + vk::raii::ImageView imageView = nullptr; }; struct DepthBufferData : public ImageData @@ -354,12 +358,12 @@ namespace vk glfwCreateWindowSurface( static_cast( *instance ), window.handle, nullptr, &_surface ); if ( err != VK_SUCCESS ) throw std::runtime_error( "Failed to create window!" ); - pSurface = vk::raii::su::make_unique( instance, _surface ); + surface = vk::raii::SurfaceKHR( instance, _surface ); } - vk::Extent2D extent; - vk::su::WindowData window; - std::unique_ptr pSurface; + vk::Extent2D extent; + vk::su::WindowData window; + vk::raii::SurfaceKHR surface = nullptr; }; struct SwapChainData @@ -431,9 +435,9 @@ namespace vk swapChainCreateInfo.queueFamilyIndexCount = 2; swapChainCreateInfo.pQueueFamilyIndices = queueFamilyIndices; } - pSwapChain = vk::raii::su::make_unique( device, swapChainCreateInfo ); + swapChain = vk::raii::SwapchainKHR( device, swapChainCreateInfo ); - images = pSwapChain->getImages(); + images = swapChain.getImages(); imageViews.reserve( images.size() ); vk::ComponentMapping componentMapping( @@ -451,10 +455,10 @@ namespace vk } } - vk::Format colorFormat; - std::unique_ptr pSwapChain; - std::vector images; - std::vector imageViews; + vk::Format colorFormat; + vk::raii::SwapchainKHR swapChain = nullptr; + std::vector images; + std::vector imageViews; }; struct TextureData @@ -484,7 +488,6 @@ namespace vk 0.0f, 0.0f, vk::BorderColor::eFloatOpaqueBlack } ) - { vk::FormatProperties formatProperties = physicalDevice.getFormatProperties( format ); @@ -497,7 +500,7 @@ namespace vk if ( needsStaging ) { assert( ( formatProperties.optimalTilingFeatures & formatFeatureFlags ) == formatFeatureFlags ); - pStagingBufferData = vk::raii::su::make_unique( + stagingBufferData = BufferData( physicalDevice, device, extent.width * extent.height * 4, vk::BufferUsageFlagBits::eTransferSrc ); imageTiling = vk::ImageTiling::eOptimal; usageFlags |= vk::ImageUsageFlagBits::eTransferDst; @@ -509,15 +512,15 @@ namespace vk initialLayout = vk::ImageLayout::ePreinitialized; requirements = vk::MemoryPropertyFlagBits::eHostCoherent | vk::MemoryPropertyFlagBits::eHostVisible; } - pImageData = vk::raii::su::make_unique( physicalDevice, - device, - format, - extent, - imageTiling, - usageFlags | vk::ImageUsageFlagBits::eSampled, - initialLayout, - requirements, - vk::ImageAspectFlagBits::eColor ); + imageData = ImageData( physicalDevice, + device, + format, + extent, + imageTiling, + usageFlags | vk::ImageUsageFlagBits::eSampled, + initialLayout, + requirements, + vk::ImageAspectFlagBits::eColor ); } template @@ -525,17 +528,17 @@ namespace vk { void * data = needsStaging - ? pStagingBufferData->deviceMemory.mapMemory( 0, pStagingBufferData->buffer.getMemoryRequirements().size ) - : pImageData->deviceMemory.mapMemory( 0, pImageData->image.getMemoryRequirements().size ); + ? stagingBufferData.deviceMemory.mapMemory( 0, stagingBufferData.buffer.getMemoryRequirements().size ) + : imageData.deviceMemory.mapMemory( 0, imageData.image.getMemoryRequirements().size ); imageGenerator( data, extent ); - needsStaging ? pStagingBufferData->deviceMemory.unmapMemory() : pImageData->deviceMemory.unmapMemory(); + needsStaging ? stagingBufferData.deviceMemory.unmapMemory() : imageData.deviceMemory.unmapMemory(); if ( needsStaging ) { // Since we're going to blit to the texture image, set its layout to eTransferDstOptimal vk::raii::su::setImageLayout( commandBuffer, - *pImageData->image, - pImageData->format, + *imageData.image, + imageData.format, vk::ImageLayout::eUndefined, vk::ImageLayout::eTransferDstOptimal ); vk::BufferImageCopy copyRegion( 0, @@ -545,11 +548,11 @@ namespace vk vk::Offset3D( 0, 0, 0 ), vk::Extent3D( extent, 1 ) ); commandBuffer.copyBufferToImage( - *pStagingBufferData->buffer, *pImageData->image, vk::ImageLayout::eTransferDstOptimal, copyRegion ); - // Set the layout for the texture image from eTransferDstOptimal to SHADER_READ_ONLY + *stagingBufferData.buffer, *imageData.image, vk::ImageLayout::eTransferDstOptimal, copyRegion ); + // Set the layout for the texture image from eTransferDstOptimal to eShaderReadOnlyOptimal vk::raii::su::setImageLayout( commandBuffer, - *pImageData->image, - pImageData->format, + *imageData.image, + imageData.format, vk::ImageLayout::eTransferDstOptimal, vk::ImageLayout::eShaderReadOnlyOptimal ); } @@ -557,19 +560,19 @@ namespace vk { // If we can use the linear tiled image as a texture, just do it vk::raii::su::setImageLayout( commandBuffer, - *pImageData->image, - pImageData->format, + *imageData.image, + imageData.format, vk::ImageLayout::ePreinitialized, vk::ImageLayout::eShaderReadOnlyOptimal ); } } - vk::Format format; - vk::Extent2D extent; - bool needsStaging; - std::unique_ptr pStagingBufferData; - std::unique_ptr pImageData; - vk::raii::Sampler sampler; + vk::Format format; + vk::Extent2D extent; + bool needsStaging; + BufferData stagingBufferData = nullptr; + ImageData imageData = nullptr; + vk::raii::Sampler sampler; }; std::pair @@ -957,7 +960,7 @@ namespace vk } vk::DescriptorImageInfo imageInfo( - *textureData.sampler, **textureData.pImageData->pImageView, vk::ImageLayout::eShaderReadOnlyOptimal ); + *textureData.sampler, *textureData.imageData.imageView, vk::ImageLayout::eShaderReadOnlyOptimal ); writeDescriptorSets.emplace_back( *descriptorSet, dstBinding, 0, vk::DescriptorType::eCombinedImageSampler, imageInfo, nullptr, nullptr ); @@ -1002,8 +1005,7 @@ namespace vk imageInfos.reserve( textureData.size() ); for ( auto const & thd : textureData ) { - imageInfos.emplace_back( - *thd.sampler, **thd.pImageData->pImageView, vk::ImageLayout::eShaderReadOnlyOptimal ); + imageInfos.emplace_back( *thd.sampler, *thd.imageData.imageView, vk::ImageLayout::eShaderReadOnlyOptimal ); } writeDescriptorSets.emplace_back( *descriptorSet, dstBinding, diff --git a/README.md b/README.md index 4720ab5..fed89bc 100644 --- a/README.md +++ b/README.md @@ -576,11 +576,6 @@ By defining ```VULKAN_HPP_NO_SMART_HANDLE``` before including vulkan.hpp, the he With C++20, the so-called spaceship-operator ```<=>``` is introduced. If that operator is supported, all the structs and classes in vulkan.hpp use the default implementation of it. As currently some implementations of this operator are very slow, and others seem to be incomplete, by defining ```VULKAN_HPP_NO_SPACESHIP_OPERATOR``` before including vulkan.hpp you can remove that operator from those structs and classes. -#### VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS - -By default, the vk::raii wrapper classes don't support default constructors. It would be a contradiction to the raii-principle. -For those who are desparate enough to ignore that restriction, you can define VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS. The only thing you can do with a default contructed vk::raii wrapper object is move-assigning another vk::raii wrapper object onto it. And you have to make sure that that happens before you use it. - #### VULKAN_HPP_STORAGE_API With this define you can specify whether the ```DispatchLoaderDynamic``` is imported or exported (see ```VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE```). If ```VULKAN_HPP_STORAGE_API``` is not defined externally, and ```VULKAN_HPP_STORAGE_SHARED``` is defined, depending on the ```VULKAN_HPP_STORAGE_SHARED_EXPORT``` being defined, ```VULKAN_HPP_STORAGE_API``` is either set to ```__declspec( dllexport )``` (for MSVC) / ```__attribute__( ( visibility( "default" ) ) )``` (for gcc or clang) or ```__declspec( dllimport )``` (for MSVC), respectively. For other compilers, you might specify the corresponding storage by defining ```VULKAN_HPP_STORAGE_API``` on your own. diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 30ba45a..a121fd4 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -575,13 +575,9 @@ ${contextMembers} class InstanceDispatcher : public DispatchLoaderBase { public: - InstanceDispatcher( PFN_vkGetInstanceProcAddr getProcAddr ) - : vkGetInstanceProcAddr( getProcAddr ) - {} + InstanceDispatcher( PFN_vkGetInstanceProcAddr getProcAddr ) : vkGetInstanceProcAddr( getProcAddr ) {} -#if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - InstanceDispatcher() = default; -#endif + InstanceDispatcher( std::nullptr_t ) : DispatchLoaderBase( nullptr ) {} void init( VkInstance instance ) { @@ -602,21 +598,17 @@ ${instanceMembers} std::string deviceDispatcherTemplate = R"( class DeviceDispatcher : public DispatchLoaderBase { - public: - DeviceDispatcher( PFN_vkGetDeviceProcAddr getProcAddr ) - : vkGetDeviceProcAddr( getProcAddr ) - {} + public: + DeviceDispatcher( PFN_vkGetDeviceProcAddr getProcAddr ) : vkGetDeviceProcAddr( getProcAddr ) {} -#if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - DeviceDispatcher() = default; -#endif + DeviceDispatcher( std::nullptr_t ) : DispatchLoaderBase( nullptr ) {} - void init( VkDevice device ) - { + void init( VkDevice device ) + { ${deviceAssignments} - } + } - public: + public: ${deviceMembers} }; )"; @@ -7319,13 +7311,10 @@ ${enter} class ${handleType} public: ${singularConstructors} ${upgradeConstructor} + ${handleType}( std::nullptr_t ) {} ${destructor} -#if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - ${handleType}() = default; -#else ${handleType}() = delete; -#endif ${handleType}( ${handleType} const & ) = delete; ${handleType}( ${handleType} && rhs ) VULKAN_HPP_NOEXCEPT : ${moveConstructorInitializerList} @@ -7351,18 +7340,6 @@ ${getConstructorSuccessCode} VULKAN_HPP_ASSERT( m_dispatcher${dispatcherAccess}getVkHeaderVersion() == VK_HEADER_VERSION ); return ${getDispatcherReturn}m_dispatcher; } - -#if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_${handleName}.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_${handleName}.operator!(); - } -#endif ${memberFunctionsDeclarations} private: @@ -7399,11 +7376,7 @@ ${enter} class ${handleType}s : public std::vector name = startLowerCase( stripPrefix( name, "p" ) ); } memberVariables += "\n " + destructorParam.type.prefix + " " + destructorParam.type.type + " " + - destructorParam.type.postfix + " m_" + name + ";"; + destructorParam.type.postfix + " m_" + name + + ( destructorParam.type.postfix.empty() ? "" : " = nullptr" ) + ";"; moveConstructorInitializerList += ", m_" + name + "( rhs.m_" + name + " )"; moveAssignmentInstructions += "\n m_" + name + " = rhs.m_" + name + ";"; } @@ -10417,20 +10391,23 @@ std::tuple if ( handle.first == "VkInstance" ) { - memberVariables += "\n VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher m_dispatcher;"; + memberVariables += + "\n VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher m_dispatcher = nullptr;"; } else if ( handle.first == "VkDevice" ) { - memberVariables += "\n VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher m_dispatcher;"; + memberVariables += + "\n VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher m_dispatcher = nullptr;"; } else if ( handle.second.constructorIts.front()->second.params.front().type.type == "VkDevice" ) { - memberVariables += "\n VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher;"; + memberVariables += + "\n VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr;"; } else { memberVariables += - "\n VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher;"; + "\n VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher = nullptr;"; } moveConstructorInitializerList += ", m_dispatcher( rhs.m_dispatcher )"; @@ -16571,15 +16548,24 @@ int main( int argc, char ** argv ) static const std::string dispatchLoaderBase = R"( class DispatchLoaderBase { -#if !defined(NDEBUG) public: + DispatchLoaderBase() = default; + DispatchLoaderBase( std::nullptr_t ) +#if !defined( NDEBUG ) + : m_valid( false ) +#endif + {} + +#if !defined( NDEBUG ) size_t getVkHeaderVersion() const { + VULKAN_HPP_ASSERT( m_valid ); return vkHeaderVersion; } private: size_t vkHeaderVersion = VK_HEADER_VERSION; + bool m_valid = true; #endif }; )"; diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index 9da4736..e4c09cf 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -1385,15 +1385,24 @@ namespace VULKAN_HPP_NAMESPACE class DispatchLoaderBase { -#if !defined( NDEBUG ) public: + DispatchLoaderBase() = default; + DispatchLoaderBase( std::nullptr_t ) +#if !defined( NDEBUG ) + : m_valid( false ) +#endif + {} + +#if !defined( NDEBUG ) size_t getVkHeaderVersion() const { + VULKAN_HPP_ASSERT( m_valid ); return vkHeaderVersion; } private: size_t vkHeaderVersion = VK_HEADER_VERSION; + bool m_valid = true; #endif }; diff --git a/vulkan/vulkan_raii.hpp b/vulkan/vulkan_raii.hpp index 5b4e89d..4839b09 100644 --- a/vulkan/vulkan_raii.hpp +++ b/vulkan/vulkan_raii.hpp @@ -65,9 +65,7 @@ namespace VULKAN_HPP_NAMESPACE public: InstanceDispatcher( PFN_vkGetInstanceProcAddr getProcAddr ) : vkGetInstanceProcAddr( getProcAddr ) {} -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - InstanceDispatcher() = default; -# endif + InstanceDispatcher( std::nullptr_t ) : DispatchLoaderBase( nullptr ) {} void init( VkInstance instance ) { @@ -684,9 +682,7 @@ namespace VULKAN_HPP_NAMESPACE public: DeviceDispatcher( PFN_vkGetDeviceProcAddr getProcAddr ) : vkGetDeviceProcAddr( getProcAddr ) {} -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - DeviceDispatcher() = default; -# endif + DeviceDispatcher( std::nullptr_t ) : DispatchLoaderBase( nullptr ) {} void init( VkDevice device ) { @@ -2308,6 +2304,8 @@ namespace VULKAN_HPP_NAMESPACE m_dispatcher.init( static_cast( m_instance ) ); } + Instance( std::nullptr_t ) {} + ~Instance() { if ( m_instance ) @@ -2316,11 +2314,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - Instance() = default; -# else - Instance() = delete; -# endif + Instance() = delete; Instance( Instance const & ) = delete; Instance( Instance && rhs ) VULKAN_HPP_NOEXCEPT : m_instance( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_instance, {} ) ) @@ -2354,18 +2348,6 @@ namespace VULKAN_HPP_NAMESPACE return &m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_instance.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_instance.operator!(); - } -# endif - //=== VK_VERSION_1_0 === VULKAN_HPP_NODISCARD PFN_vkVoidFunction getProcAddr( const std::string & name ) const VULKAN_HPP_NOEXCEPT; @@ -2399,8 +2381,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::Instance m_instance; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher m_dispatcher = nullptr; }; class PhysicalDevice @@ -2423,12 +2405,9 @@ namespace VULKAN_HPP_NAMESPACE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * dispatcher ) : m_physicalDevice( physicalDevice ), m_dispatcher( dispatcher ) {} + PhysicalDevice( std::nullptr_t ) {} -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - PhysicalDevice() = default; -# else - PhysicalDevice() = delete; -# endif + PhysicalDevice() = delete; PhysicalDevice( PhysicalDevice const & ) = delete; PhysicalDevice( PhysicalDevice && rhs ) VULKAN_HPP_NOEXCEPT : m_physicalDevice( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_physicalDevice, {} ) ) @@ -2456,18 +2435,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_physicalDevice.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_physicalDevice.operator!(); - } -# endif - //=== VK_VERSION_1_0 === VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::PhysicalDeviceFeatures getFeatures() const VULKAN_HPP_NOEXCEPT; @@ -2792,7 +2759,7 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::PhysicalDevice m_physicalDevice; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher = nullptr; }; class PhysicalDevices : public std::vector @@ -2831,11 +2798,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - PhysicalDevices() = default; -# else - PhysicalDevices() = delete; -# endif + PhysicalDevices() = delete; PhysicalDevices( PhysicalDevices const & ) = delete; PhysicalDevices( PhysicalDevices && rhs ) = default; PhysicalDevices & operator=( PhysicalDevices const & ) = delete; @@ -2883,6 +2846,8 @@ namespace VULKAN_HPP_NAMESPACE m_dispatcher.init( static_cast( m_device ) ); } + Device( std::nullptr_t ) {} + ~Device() { if ( m_device ) @@ -2891,11 +2856,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - Device() = default; -# else - Device() = delete; -# endif + Device() = delete; Device( Device const & ) = delete; Device( Device && rhs ) VULKAN_HPP_NOEXCEPT : m_device( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_device, {} ) ) @@ -2929,18 +2890,6 @@ namespace VULKAN_HPP_NAMESPACE return &m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_device.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_device.operator!(); - } -# endif - //=== VK_VERSION_1_0 === VULKAN_HPP_NODISCARD PFN_vkVoidFunction getProcAddr( const std::string & name ) const VULKAN_HPP_NOEXCEPT; @@ -3372,8 +3321,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::Device m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher m_dispatcher = nullptr; }; class AccelerationStructureKHR @@ -3419,6 +3368,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + AccelerationStructureKHR( std::nullptr_t ) {} + ~AccelerationStructureKHR() { if ( m_accelerationStructureKHR ) @@ -3428,11 +3379,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - AccelerationStructureKHR() = default; -# else - AccelerationStructureKHR() = delete; -# endif + AccelerationStructureKHR() = delete; AccelerationStructureKHR( AccelerationStructureKHR const & ) = delete; AccelerationStructureKHR( AccelerationStructureKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_accelerationStructureKHR( @@ -3471,23 +3418,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_accelerationStructureKHR.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_accelerationStructureKHR.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::AccelerationStructureKHR m_accelerationStructureKHR; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class AccelerationStructureNV @@ -3533,6 +3468,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + AccelerationStructureNV( std::nullptr_t ) {} + ~AccelerationStructureNV() { if ( m_accelerationStructureNV ) @@ -3542,11 +3479,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - AccelerationStructureNV() = default; -# else - AccelerationStructureNV() = delete; -# endif + AccelerationStructureNV() = delete; AccelerationStructureNV( AccelerationStructureNV const & ) = delete; AccelerationStructureNV( AccelerationStructureNV && rhs ) VULKAN_HPP_NOEXCEPT : m_accelerationStructureNV( @@ -3585,18 +3518,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_accelerationStructureNV.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_accelerationStructureNV.operator!(); - } -# endif - //=== VK_NV_ray_tracing === template @@ -3608,8 +3529,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::AccelerationStructureNV m_accelerationStructureNV; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class Buffer @@ -3652,6 +3573,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + Buffer( std::nullptr_t ) {} + ~Buffer() { if ( m_buffer ) @@ -3660,11 +3583,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - Buffer() = default; -# else - Buffer() = delete; -# endif + Buffer() = delete; Buffer( Buffer const & ) = delete; Buffer( Buffer && rhs ) VULKAN_HPP_NOEXCEPT : m_buffer( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_buffer, {} ) ) @@ -3700,18 +3619,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_buffer.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_buffer.operator!(); - } -# endif - //=== VK_VERSION_1_0 === void bindMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory, VULKAN_HPP_NAMESPACE::DeviceSize memoryOffset ) const; @@ -3721,8 +3628,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::Buffer m_buffer; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; # if defined( VK_USE_PLATFORM_FUCHSIA ) @@ -3769,6 +3676,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + BufferCollectionFUCHSIA( std::nullptr_t ) {} + ~BufferCollectionFUCHSIA() { if ( m_bufferCollectionFUCHSIA ) @@ -3778,11 +3687,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - BufferCollectionFUCHSIA() = default; -# else - BufferCollectionFUCHSIA() = delete; -# endif + BufferCollectionFUCHSIA() = delete; BufferCollectionFUCHSIA( BufferCollectionFUCHSIA const & ) = delete; BufferCollectionFUCHSIA( BufferCollectionFUCHSIA && rhs ) VULKAN_HPP_NOEXCEPT : m_bufferCollectionFUCHSIA( @@ -3821,18 +3726,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_bufferCollectionFUCHSIA.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_bufferCollectionFUCHSIA.operator!(); - } -# endif - //=== VK_FUCHSIA_buffer_collection === void setImageConstraints( const VULKAN_HPP_NAMESPACE::ImageConstraintsInfoFUCHSIA & imageConstraintsInfo ) const; @@ -3845,8 +3738,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::BufferCollectionFUCHSIA m_bufferCollectionFUCHSIA; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; # endif /*VK_USE_PLATFORM_FUCHSIA*/ @@ -3890,6 +3783,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + BufferView( std::nullptr_t ) {} + ~BufferView() { if ( m_bufferView ) @@ -3898,11 +3793,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - BufferView() = default; -# else - BufferView() = delete; -# endif + BufferView() = delete; BufferView( BufferView const & ) = delete; BufferView( BufferView && rhs ) VULKAN_HPP_NOEXCEPT : m_bufferView( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_bufferView, {} ) ) @@ -3938,23 +3829,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_bufferView.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_bufferView.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::BufferView m_bufferView; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class CommandPool @@ -3997,6 +3876,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + CommandPool( std::nullptr_t ) {} + ~CommandPool() { if ( m_commandPool ) @@ -4005,11 +3886,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - CommandPool() = default; -# else - CommandPool() = delete; -# endif + CommandPool() = delete; CommandPool( CommandPool const & ) = delete; CommandPool( CommandPool && rhs ) VULKAN_HPP_NOEXCEPT : m_commandPool( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_commandPool, {} ) ) @@ -4045,18 +3922,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_commandPool.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_commandPool.operator!(); - } -# endif - //=== VK_VERSION_1_0 === void reset( VULKAN_HPP_NAMESPACE::CommandPoolResetFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const; @@ -4074,8 +3939,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::CommandPool m_commandPool; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class CommandBuffer @@ -4104,6 +3969,7 @@ namespace VULKAN_HPP_NAMESPACE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * dispatcher ) : m_commandBuffer( commandBuffer ), m_device( device ), m_commandPool( commandPool ), m_dispatcher( dispatcher ) {} + CommandBuffer( std::nullptr_t ) {} ~CommandBuffer() { @@ -4114,11 +3980,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - CommandBuffer() = default; -# else - CommandBuffer() = delete; -# endif + CommandBuffer() = delete; CommandBuffer( CommandBuffer const & ) = delete; CommandBuffer( CommandBuffer && rhs ) VULKAN_HPP_NOEXCEPT : m_commandBuffer( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_commandBuffer, {} ) ) @@ -4155,18 +4017,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_commandBuffer.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_commandBuffer.operator!(); - } -# endif - //=== VK_VERSION_1_0 === void begin( const VULKAN_HPP_NAMESPACE::CommandBufferBeginInfo & beginInfo ) const; @@ -4884,7 +4734,7 @@ namespace VULKAN_HPP_NAMESPACE VULKAN_HPP_NAMESPACE::CommandBuffer m_commandBuffer; VkDevice m_device; VkCommandPool m_commandPool; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class CommandBuffers : public std::vector @@ -4916,11 +4766,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - CommandBuffers() = default; -# else - CommandBuffers() = delete; -# endif + CommandBuffers() = delete; CommandBuffers( CommandBuffers const & ) = delete; CommandBuffers( CommandBuffers && rhs ) = default; CommandBuffers & operator=( CommandBuffers const & ) = delete; @@ -4969,6 +4815,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + CuFunctionNVX( std::nullptr_t ) {} + ~CuFunctionNVX() { if ( m_cuFunctionNVX ) @@ -4978,11 +4826,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - CuFunctionNVX() = default; -# else - CuFunctionNVX() = delete; -# endif + CuFunctionNVX() = delete; CuFunctionNVX( CuFunctionNVX const & ) = delete; CuFunctionNVX( CuFunctionNVX && rhs ) VULKAN_HPP_NOEXCEPT : m_cuFunctionNVX( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_cuFunctionNVX, {} ) ) @@ -5019,23 +4863,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_cuFunctionNVX.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_cuFunctionNVX.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::CuFunctionNVX m_cuFunctionNVX; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class CuModuleNVX @@ -5078,6 +4910,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + CuModuleNVX( std::nullptr_t ) {} + ~CuModuleNVX() { if ( m_cuModuleNVX ) @@ -5086,11 +4920,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - CuModuleNVX() = default; -# else - CuModuleNVX() = delete; -# endif + CuModuleNVX() = delete; CuModuleNVX( CuModuleNVX const & ) = delete; CuModuleNVX( CuModuleNVX && rhs ) VULKAN_HPP_NOEXCEPT : m_cuModuleNVX( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_cuModuleNVX, {} ) ) @@ -5126,23 +4956,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_cuModuleNVX.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_cuModuleNVX.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::CuModuleNVX m_cuModuleNVX; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class DebugReportCallbackEXT @@ -5188,6 +5006,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( instance.getDispatcher() ) {} + DebugReportCallbackEXT( std::nullptr_t ) {} + ~DebugReportCallbackEXT() { if ( m_debugReportCallbackEXT ) @@ -5197,11 +5017,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - DebugReportCallbackEXT() = default; -# else - DebugReportCallbackEXT() = delete; -# endif + DebugReportCallbackEXT() = delete; DebugReportCallbackEXT( DebugReportCallbackEXT const & ) = delete; DebugReportCallbackEXT( DebugReportCallbackEXT && rhs ) VULKAN_HPP_NOEXCEPT : m_debugReportCallbackEXT( @@ -5240,23 +5056,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_debugReportCallbackEXT.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_debugReportCallbackEXT.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::DebugReportCallbackEXT m_debugReportCallbackEXT; VkInstance m_instance; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher = nullptr; }; class DebugUtilsMessengerEXT @@ -5302,6 +5106,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( instance.getDispatcher() ) {} + DebugUtilsMessengerEXT( std::nullptr_t ) {} + ~DebugUtilsMessengerEXT() { if ( m_debugUtilsMessengerEXT ) @@ -5311,11 +5117,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - DebugUtilsMessengerEXT() = default; -# else - DebugUtilsMessengerEXT() = delete; -# endif + DebugUtilsMessengerEXT() = delete; DebugUtilsMessengerEXT( DebugUtilsMessengerEXT const & ) = delete; DebugUtilsMessengerEXT( DebugUtilsMessengerEXT && rhs ) VULKAN_HPP_NOEXCEPT : m_debugUtilsMessengerEXT( @@ -5354,23 +5156,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_debugUtilsMessengerEXT.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_debugUtilsMessengerEXT.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::DebugUtilsMessengerEXT m_debugUtilsMessengerEXT; VkInstance m_instance; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher = nullptr; }; class DeferredOperationKHR @@ -5414,6 +5204,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + DeferredOperationKHR( std::nullptr_t ) {} + ~DeferredOperationKHR() { if ( m_deferredOperationKHR ) @@ -5423,11 +5215,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - DeferredOperationKHR() = default; -# else - DeferredOperationKHR() = delete; -# endif + DeferredOperationKHR() = delete; DeferredOperationKHR( DeferredOperationKHR const & ) = delete; DeferredOperationKHR( DeferredOperationKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_deferredOperationKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_deferredOperationKHR, @@ -5466,18 +5254,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_deferredOperationKHR.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_deferredOperationKHR.operator!(); - } -# endif - //=== VK_KHR_deferred_host_operations === VULKAN_HPP_NODISCARD uint32_t getMaxConcurrency() const VULKAN_HPP_NOEXCEPT; @@ -5489,8 +5265,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::DeferredOperationKHR m_deferredOperationKHR; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class DescriptorPool @@ -5535,6 +5311,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + DescriptorPool( std::nullptr_t ) {} + ~DescriptorPool() { if ( m_descriptorPool ) @@ -5544,11 +5322,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - DescriptorPool() = default; -# else - DescriptorPool() = delete; -# endif + DescriptorPool() = delete; DescriptorPool( DescriptorPool const & ) = delete; DescriptorPool( DescriptorPool && rhs ) VULKAN_HPP_NOEXCEPT : m_descriptorPool( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_descriptorPool, {} ) ) @@ -5585,18 +5359,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_descriptorPool.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_descriptorPool.operator!(); - } -# endif - //=== VK_VERSION_1_0 === void reset( VULKAN_HPP_NAMESPACE::DescriptorPoolResetFlags flags VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT ) const @@ -5605,8 +5367,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::DescriptorPool m_descriptorPool; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class DescriptorSet @@ -5638,6 +5400,7 @@ namespace VULKAN_HPP_NAMESPACE , m_descriptorPool( descriptorPool ) , m_dispatcher( dispatcher ) {} + DescriptorSet( std::nullptr_t ) {} ~DescriptorSet() { @@ -5648,11 +5411,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - DescriptorSet() = default; -# else - DescriptorSet() = delete; -# endif + DescriptorSet() = delete; DescriptorSet( DescriptorSet const & ) = delete; DescriptorSet( DescriptorSet && rhs ) VULKAN_HPP_NOEXCEPT : m_descriptorSet( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_descriptorSet, {} ) ) @@ -5689,18 +5448,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_descriptorSet.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_descriptorSet.operator!(); - } -# endif - //=== VK_VERSION_1_1 === void updateWithTemplate( VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate descriptorUpdateTemplate, @@ -5715,7 +5462,7 @@ namespace VULKAN_HPP_NAMESPACE VULKAN_HPP_NAMESPACE::DescriptorSet m_descriptorSet; VkDevice m_device; VkDescriptorPool m_descriptorPool; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class DescriptorSets : public std::vector @@ -5747,11 +5494,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - DescriptorSets() = default; -# else - DescriptorSets() = delete; -# endif + DescriptorSets() = delete; DescriptorSets( DescriptorSets const & ) = delete; DescriptorSets( DescriptorSets && rhs ) = default; DescriptorSets & operator=( DescriptorSets const & ) = delete; @@ -5801,6 +5544,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + DescriptorSetLayout( std::nullptr_t ) {} + ~DescriptorSetLayout() { if ( m_descriptorSetLayout ) @@ -5810,11 +5555,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - DescriptorSetLayout() = default; -# else - DescriptorSetLayout() = delete; -# endif + DescriptorSetLayout() = delete; DescriptorSetLayout( DescriptorSetLayout const & ) = delete; DescriptorSetLayout( DescriptorSetLayout && rhs ) VULKAN_HPP_NOEXCEPT : m_descriptorSetLayout( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_descriptorSetLayout, @@ -5853,23 +5594,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_descriptorSetLayout.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_descriptorSetLayout.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::DescriptorSetLayout m_descriptorSetLayout; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class DescriptorUpdateTemplate @@ -5915,6 +5644,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + DescriptorUpdateTemplate( std::nullptr_t ) {} + ~DescriptorUpdateTemplate() { if ( m_descriptorUpdateTemplate ) @@ -5924,11 +5655,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - DescriptorUpdateTemplate() = default; -# else - DescriptorUpdateTemplate() = delete; -# endif + DescriptorUpdateTemplate() = delete; DescriptorUpdateTemplate( DescriptorUpdateTemplate const & ) = delete; DescriptorUpdateTemplate( DescriptorUpdateTemplate && rhs ) VULKAN_HPP_NOEXCEPT : m_descriptorUpdateTemplate( @@ -5967,23 +5694,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_descriptorUpdateTemplate.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_descriptorUpdateTemplate.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::DescriptorUpdateTemplate m_descriptorUpdateTemplate; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class DeviceMemory @@ -6028,6 +5743,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + DeviceMemory( std::nullptr_t ) {} + ~DeviceMemory() { if ( m_deviceMemory ) @@ -6036,11 +5753,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - DeviceMemory() = default; -# else - DeviceMemory() = delete; -# endif + DeviceMemory() = delete; DeviceMemory( DeviceMemory const & ) = delete; DeviceMemory( DeviceMemory && rhs ) VULKAN_HPP_NOEXCEPT : m_deviceMemory( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_deviceMemory, {} ) ) @@ -6076,18 +5789,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_deviceMemory.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_deviceMemory.operator!(); - } -# endif - //=== VK_VERSION_1_0 === VULKAN_HPP_NODISCARD void * @@ -6113,8 +5814,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::DeviceMemory m_deviceMemory; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class DisplayKHR @@ -6190,6 +5891,7 @@ namespace VULKAN_HPP_NAMESPACE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * dispatcher ) : m_displayKHR( displayKHR ), m_physicalDevice( physicalDevice ), m_dispatcher( dispatcher ) {} + DisplayKHR( std::nullptr_t ) {} ~DisplayKHR() { @@ -6199,11 +5901,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - DisplayKHR() = default; -# else - DisplayKHR() = delete; -# endif + DisplayKHR() = delete; DisplayKHR( DisplayKHR const & ) = delete; DisplayKHR( DisplayKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_displayKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_displayKHR, {} ) ) @@ -6237,18 +5935,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_displayKHR.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_displayKHR.operator!(); - } -# endif - //=== VK_KHR_display === VULKAN_HPP_NODISCARD std::vector getModeProperties() const; @@ -6266,7 +5952,7 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::DisplayKHR m_displayKHR; VkPhysicalDevice m_physicalDevice; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher = nullptr; }; class DisplayKHRs : public std::vector @@ -6306,11 +5992,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - DisplayKHRs() = default; -# else - DisplayKHRs() = delete; -# endif + DisplayKHRs() = delete; DisplayKHRs( DisplayKHRs const & ) = delete; DisplayKHRs( DisplayKHRs && rhs ) = default; DisplayKHRs & operator=( DisplayKHRs const & ) = delete; @@ -6356,11 +6038,9 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( physicalDevice.getDispatcher() ) {} -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - DisplayModeKHR() = default; -# else - DisplayModeKHR() = delete; -# endif + DisplayModeKHR( std::nullptr_t ) {} + + DisplayModeKHR() = delete; DisplayModeKHR( DisplayModeKHR const & ) = delete; DisplayModeKHR( DisplayModeKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_displayModeKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_displayModeKHR, {} ) ) @@ -6388,18 +6068,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_displayModeKHR.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_displayModeKHR.operator!(); - } -# endif - //=== VK_KHR_display === VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::DisplayPlaneCapabilitiesKHR @@ -6408,7 +6076,7 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::DisplayModeKHR m_displayModeKHR; VULKAN_HPP_NAMESPACE::PhysicalDevice m_physicalDevice; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher = nullptr; }; class Event @@ -6451,6 +6119,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + Event( std::nullptr_t ) {} + ~Event() { if ( m_event ) @@ -6459,11 +6129,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - Event() = default; -# else - Event() = delete; -# endif + Event() = delete; Event( Event const & ) = delete; Event( Event && rhs ) VULKAN_HPP_NOEXCEPT : m_event( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_event, {} ) ) @@ -6499,18 +6165,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_event.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_event.operator!(); - } -# endif - //=== VK_VERSION_1_0 === VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result getStatus() const; @@ -6522,8 +6176,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::Event m_event; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class Fence @@ -6607,6 +6261,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + Fence( std::nullptr_t ) {} + ~Fence() { if ( m_fence ) @@ -6615,11 +6271,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - Fence() = default; -# else - Fence() = delete; -# endif + Fence() = delete; Fence( Fence const & ) = delete; Fence( Fence && rhs ) VULKAN_HPP_NOEXCEPT : m_fence( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_fence, {} ) ) @@ -6655,18 +6307,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_fence.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_fence.operator!(); - } -# endif - //=== VK_VERSION_1_0 === VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Result getStatus() const; @@ -6674,8 +6314,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::Fence m_fence; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class Framebuffer @@ -6718,6 +6358,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + Framebuffer( std::nullptr_t ) {} + ~Framebuffer() { if ( m_framebuffer ) @@ -6726,11 +6368,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - Framebuffer() = default; -# else - Framebuffer() = delete; -# endif + Framebuffer() = delete; Framebuffer( Framebuffer const & ) = delete; Framebuffer( Framebuffer && rhs ) VULKAN_HPP_NOEXCEPT : m_framebuffer( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_framebuffer, {} ) ) @@ -6766,23 +6404,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_framebuffer.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_framebuffer.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::Framebuffer m_framebuffer; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class Image @@ -6825,6 +6451,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + Image( std::nullptr_t ) {} + ~Image() { if ( m_image ) @@ -6833,11 +6461,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - Image() = default; -# else - Image() = delete; -# endif + Image() = delete; Image( Image const & ) = delete; Image( Image && rhs ) VULKAN_HPP_NOEXCEPT : m_image( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_image, {} ) ) @@ -6873,18 +6497,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_image.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_image.operator!(); - } -# endif - //=== VK_VERSION_1_0 === void bindMemory( VULKAN_HPP_NAMESPACE::DeviceMemory memory, VULKAN_HPP_NAMESPACE::DeviceSize memoryOffset ) const; @@ -6905,8 +6517,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::Image m_image; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class ImageView @@ -6949,6 +6561,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + ImageView( std::nullptr_t ) {} + ~ImageView() { if ( m_imageView ) @@ -6957,11 +6571,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - ImageView() = default; -# else - ImageView() = delete; -# endif + ImageView() = delete; ImageView( ImageView const & ) = delete; ImageView( ImageView && rhs ) VULKAN_HPP_NOEXCEPT : m_imageView( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_imageView, {} ) ) @@ -6997,18 +6607,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_imageView.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_imageView.operator!(); - } -# endif - //=== VK_NVX_image_view_handle === VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::ImageViewAddressPropertiesNVX getAddressNVX() const; @@ -7016,8 +6614,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::ImageView m_imageView; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class IndirectCommandsLayoutNV @@ -7063,6 +6661,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + IndirectCommandsLayoutNV( std::nullptr_t ) {} + ~IndirectCommandsLayoutNV() { if ( m_indirectCommandsLayoutNV ) @@ -7072,11 +6672,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - IndirectCommandsLayoutNV() = default; -# else - IndirectCommandsLayoutNV() = delete; -# endif + IndirectCommandsLayoutNV() = delete; IndirectCommandsLayoutNV( IndirectCommandsLayoutNV const & ) = delete; IndirectCommandsLayoutNV( IndirectCommandsLayoutNV && rhs ) VULKAN_HPP_NOEXCEPT : m_indirectCommandsLayoutNV( @@ -7115,23 +6711,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_indirectCommandsLayoutNV.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_indirectCommandsLayoutNV.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::IndirectCommandsLayoutNV m_indirectCommandsLayoutNV; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class PerformanceConfigurationINTEL @@ -7168,6 +6752,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + PerformanceConfigurationINTEL( std::nullptr_t ) {} + ~PerformanceConfigurationINTEL() { if ( m_performanceConfigurationINTEL ) @@ -7177,11 +6763,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - PerformanceConfigurationINTEL() = default; -# else - PerformanceConfigurationINTEL() = delete; -# endif + PerformanceConfigurationINTEL() = delete; PerformanceConfigurationINTEL( PerformanceConfigurationINTEL const & ) = delete; PerformanceConfigurationINTEL( PerformanceConfigurationINTEL && rhs ) VULKAN_HPP_NOEXCEPT : m_performanceConfigurationINTEL( @@ -7218,22 +6800,10 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_performanceConfigurationINTEL.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_performanceConfigurationINTEL.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::PerformanceConfigurationINTEL m_performanceConfigurationINTEL; VkDevice m_device; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class PipelineCache @@ -7278,6 +6848,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + PipelineCache( std::nullptr_t ) {} + ~PipelineCache() { if ( m_pipelineCache ) @@ -7287,11 +6859,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - PipelineCache() = default; -# else - PipelineCache() = delete; -# endif + PipelineCache() = delete; PipelineCache( PipelineCache const & ) = delete; PipelineCache( PipelineCache && rhs ) VULKAN_HPP_NOEXCEPT : m_pipelineCache( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_pipelineCache, {} ) ) @@ -7328,18 +6896,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_pipelineCache.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_pipelineCache.operator!(); - } -# endif - //=== VK_VERSION_1_0 === VULKAN_HPP_NODISCARD std::vector getData() const; @@ -7349,8 +6905,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::PipelineCache m_pipelineCache; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class Pipeline @@ -7493,6 +7049,7 @@ namespace VULKAN_HPP_NAMESPACE , m_constructorSuccessCode( successCode ) , m_dispatcher( dispatcher ) {} + Pipeline( std::nullptr_t ) {} ~Pipeline() { @@ -7502,11 +7059,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - Pipeline() = default; -# else - Pipeline() = delete; -# endif + Pipeline() = delete; Pipeline( Pipeline const & ) = delete; Pipeline( Pipeline && rhs ) VULKAN_HPP_NOEXCEPT : m_pipeline( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_pipeline, {} ) ) @@ -7547,18 +7100,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_pipeline.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_pipeline.operator!(); - } -# endif - //=== VK_AMD_shader_info === VULKAN_HPP_NODISCARD std::vector @@ -7600,9 +7141,9 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::Pipeline m_pipeline; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; + const VkAllocationCallbacks * m_allocator = nullptr; VULKAN_HPP_NAMESPACE::Result m_constructorSuccessCode; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class Pipelines : public std::vector @@ -7765,11 +7306,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - Pipelines() = default; -# else - Pipelines() = delete; -# endif + Pipelines() = delete; Pipelines( Pipelines const & ) = delete; Pipelines( Pipelines && rhs ) = default; Pipelines & operator=( Pipelines const & ) = delete; @@ -7818,6 +7355,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + PipelineLayout( std::nullptr_t ) {} + ~PipelineLayout() { if ( m_pipelineLayout ) @@ -7827,11 +7366,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - PipelineLayout() = default; -# else - PipelineLayout() = delete; -# endif + PipelineLayout() = delete; PipelineLayout( PipelineLayout const & ) = delete; PipelineLayout( PipelineLayout && rhs ) VULKAN_HPP_NOEXCEPT : m_pipelineLayout( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_pipelineLayout, {} ) ) @@ -7868,23 +7403,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_pipelineLayout.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_pipelineLayout.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::PipelineLayout m_pipelineLayout; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class PrivateDataSlotEXT @@ -7930,6 +7453,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + PrivateDataSlotEXT( std::nullptr_t ) {} + ~PrivateDataSlotEXT() { if ( m_privateDataSlotEXT ) @@ -7939,11 +7464,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - PrivateDataSlotEXT() = default; -# else - PrivateDataSlotEXT() = delete; -# endif + PrivateDataSlotEXT() = delete; PrivateDataSlotEXT( PrivateDataSlotEXT const & ) = delete; PrivateDataSlotEXT( PrivateDataSlotEXT && rhs ) VULKAN_HPP_NOEXCEPT : m_privateDataSlotEXT( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_privateDataSlotEXT, @@ -7982,23 +7503,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_privateDataSlotEXT.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_privateDataSlotEXT.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::PrivateDataSlotEXT m_privateDataSlotEXT; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class QueryPool @@ -8041,6 +7550,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + QueryPool( std::nullptr_t ) {} + ~QueryPool() { if ( m_queryPool ) @@ -8049,11 +7560,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - QueryPool() = default; -# else - QueryPool() = delete; -# endif + QueryPool() = delete; QueryPool( QueryPool const & ) = delete; QueryPool( QueryPool && rhs ) VULKAN_HPP_NOEXCEPT : m_queryPool( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_queryPool, {} ) ) @@ -8089,18 +7596,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_queryPool.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_queryPool.operator!(); - } -# endif - //=== VK_VERSION_1_0 === template @@ -8129,8 +7624,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::QueryPool m_queryPool; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class Queue @@ -8166,11 +7661,9 @@ namespace VULKAN_HPP_NAMESPACE : m_queue( queue ), m_dispatcher( device.getDispatcher() ) {} -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - Queue() = default; -# else - Queue() = delete; -# endif + Queue( std::nullptr_t ) {} + + Queue() = delete; Queue( Queue const & ) = delete; Queue( Queue && rhs ) VULKAN_HPP_NOEXCEPT : m_queue( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_queue, {} ) ) @@ -8198,18 +7691,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_queue.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_queue.operator!(); - } -# endif - //=== VK_VERSION_1_0 === void submit( ArrayProxy const & submits, @@ -8254,7 +7735,7 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::Queue m_queue; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class RenderPass @@ -8316,6 +7797,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + RenderPass( std::nullptr_t ) {} + ~RenderPass() { if ( m_renderPass ) @@ -8324,11 +7807,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - RenderPass() = default; -# else - RenderPass() = delete; -# endif + RenderPass() = delete; RenderPass( RenderPass const & ) = delete; RenderPass( RenderPass && rhs ) VULKAN_HPP_NOEXCEPT : m_renderPass( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_renderPass, {} ) ) @@ -8364,18 +7843,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_renderPass.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_renderPass.operator!(); - } -# endif - //=== VK_VERSION_1_0 === VULKAN_HPP_NODISCARD VULKAN_HPP_NAMESPACE::Extent2D getRenderAreaGranularity() const VULKAN_HPP_NOEXCEPT; @@ -8388,8 +7855,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::RenderPass m_renderPass; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class Sampler @@ -8432,6 +7899,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + Sampler( std::nullptr_t ) {} + ~Sampler() { if ( m_sampler ) @@ -8440,11 +7909,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - Sampler() = default; -# else - Sampler() = delete; -# endif + Sampler() = delete; Sampler( Sampler const & ) = delete; Sampler( Sampler && rhs ) VULKAN_HPP_NOEXCEPT : m_sampler( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_sampler, {} ) ) @@ -8480,23 +7945,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_sampler.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_sampler.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::Sampler m_sampler; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class SamplerYcbcrConversion @@ -8542,6 +7995,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + SamplerYcbcrConversion( std::nullptr_t ) {} + ~SamplerYcbcrConversion() { if ( m_samplerYcbcrConversion ) @@ -8551,11 +8006,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - SamplerYcbcrConversion() = default; -# else - SamplerYcbcrConversion() = delete; -# endif + SamplerYcbcrConversion() = delete; SamplerYcbcrConversion( SamplerYcbcrConversion const & ) = delete; SamplerYcbcrConversion( SamplerYcbcrConversion && rhs ) VULKAN_HPP_NOEXCEPT : m_samplerYcbcrConversion( @@ -8594,23 +8045,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_samplerYcbcrConversion.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_samplerYcbcrConversion.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::SamplerYcbcrConversion m_samplerYcbcrConversion; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class Semaphore @@ -8653,6 +8092,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + Semaphore( std::nullptr_t ) {} + ~Semaphore() { if ( m_semaphore ) @@ -8661,11 +8102,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - Semaphore() = default; -# else - Semaphore() = delete; -# endif + Semaphore() = delete; Semaphore( Semaphore const & ) = delete; Semaphore( Semaphore && rhs ) VULKAN_HPP_NOEXCEPT : m_semaphore( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_semaphore, {} ) ) @@ -8701,18 +8138,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_semaphore.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_semaphore.operator!(); - } -# endif - //=== VK_VERSION_1_2 === VULKAN_HPP_NODISCARD uint64_t getCounterValue() const; @@ -8724,8 +8149,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::Semaphore m_semaphore; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class ShaderModule @@ -8770,6 +8195,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + ShaderModule( std::nullptr_t ) {} + ~ShaderModule() { if ( m_shaderModule ) @@ -8779,11 +8206,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - ShaderModule() = default; -# else - ShaderModule() = delete; -# endif + ShaderModule() = delete; ShaderModule( ShaderModule const & ) = delete; ShaderModule( ShaderModule && rhs ) VULKAN_HPP_NOEXCEPT : m_shaderModule( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_shaderModule, {} ) ) @@ -8820,23 +8243,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_shaderModule.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_shaderModule.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::ShaderModule m_shaderModule; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class SurfaceKHR @@ -9182,6 +8593,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( instance.getDispatcher() ) {} + SurfaceKHR( std::nullptr_t ) {} + ~SurfaceKHR() { if ( m_surfaceKHR ) @@ -9190,11 +8603,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - SurfaceKHR() = default; -# else - SurfaceKHR() = delete; -# endif + SurfaceKHR() = delete; SurfaceKHR( SurfaceKHR const & ) = delete; SurfaceKHR( SurfaceKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_surfaceKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_surfaceKHR, {} ) ) @@ -9230,23 +8639,11 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_surfaceKHR.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_surfaceKHR.operator!(); - } -# endif - private: VULKAN_HPP_NAMESPACE::SurfaceKHR m_surfaceKHR; VkInstance m_instance; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::InstanceDispatcher const * m_dispatcher = nullptr; }; class SwapchainKHR @@ -9297,6 +8694,7 @@ namespace VULKAN_HPP_NAMESPACE VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * dispatcher ) : m_swapchainKHR( swapchainKHR ), m_device( device ), m_allocator( allocator ), m_dispatcher( dispatcher ) {} + SwapchainKHR( std::nullptr_t ) {} ~SwapchainKHR() { @@ -9307,11 +8705,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - SwapchainKHR() = default; -# else - SwapchainKHR() = delete; -# endif + SwapchainKHR() = delete; SwapchainKHR( SwapchainKHR const & ) = delete; SwapchainKHR( SwapchainKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_swapchainKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_swapchainKHR, {} ) ) @@ -9348,18 +8742,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_swapchainKHR.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_swapchainKHR.operator!(); - } -# endif - //=== VK_KHR_swapchain === VULKAN_HPP_NODISCARD std::vector getImages() const; @@ -9403,8 +8785,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::SwapchainKHR m_swapchainKHR; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; class SwapchainKHRs : public std::vector @@ -9443,11 +8825,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - SwapchainKHRs() = default; -# else - SwapchainKHRs() = delete; -# endif + SwapchainKHRs() = delete; SwapchainKHRs( SwapchainKHRs const & ) = delete; SwapchainKHRs( SwapchainKHRs && rhs ) = default; SwapchainKHRs & operator=( SwapchainKHRs const & ) = delete; @@ -9497,6 +8875,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + ValidationCacheEXT( std::nullptr_t ) {} + ~ValidationCacheEXT() { if ( m_validationCacheEXT ) @@ -9506,11 +8886,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - ValidationCacheEXT() = default; -# else - ValidationCacheEXT() = delete; -# endif + ValidationCacheEXT() = delete; ValidationCacheEXT( ValidationCacheEXT const & ) = delete; ValidationCacheEXT( ValidationCacheEXT && rhs ) VULKAN_HPP_NOEXCEPT : m_validationCacheEXT( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_validationCacheEXT, @@ -9549,18 +8925,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_validationCacheEXT.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_validationCacheEXT.operator!(); - } -# endif - //=== VK_EXT_validation_cache === void merge( ArrayProxy const & srcCaches ) const; @@ -9570,8 +8934,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::ValidationCacheEXT m_validationCacheEXT; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; # if defined( VK_ENABLE_BETA_EXTENSIONS ) @@ -9618,6 +8982,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + VideoSessionKHR( std::nullptr_t ) {} + ~VideoSessionKHR() { if ( m_videoSessionKHR ) @@ -9627,11 +8993,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - VideoSessionKHR() = default; -# else - VideoSessionKHR() = delete; -# endif + VideoSessionKHR() = delete; VideoSessionKHR( VideoSessionKHR const & ) = delete; VideoSessionKHR( VideoSessionKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_videoSessionKHR( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::exchange( rhs.m_videoSessionKHR, {} ) ) @@ -9668,18 +9030,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_videoSessionKHR.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_videoSessionKHR.operator!(); - } -# endif - //=== VK_KHR_video_queue === VULKAN_HPP_NODISCARD std::vector getMemoryRequirements() const; @@ -9690,8 +9040,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::VideoSessionKHR m_videoSessionKHR; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; # endif /*VK_ENABLE_BETA_EXTENSIONS*/ @@ -9739,6 +9089,8 @@ namespace VULKAN_HPP_NAMESPACE , m_dispatcher( device.getDispatcher() ) {} + VideoSessionParametersKHR( std::nullptr_t ) {} + ~VideoSessionParametersKHR() { if ( m_videoSessionParametersKHR ) @@ -9748,11 +9100,7 @@ namespace VULKAN_HPP_NAMESPACE } } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - VideoSessionParametersKHR() = default; -# else - VideoSessionParametersKHR() = delete; -# endif + VideoSessionParametersKHR() = delete; VideoSessionParametersKHR( VideoSessionParametersKHR const & ) = delete; VideoSessionParametersKHR( VideoSessionParametersKHR && rhs ) VULKAN_HPP_NOEXCEPT : m_videoSessionParametersKHR( @@ -9791,18 +9139,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dispatcher; } -# if defined( VULKAN_HPP_RAII_ENABLE_DEFAULT_CONSTRUCTORS ) - explicit operator bool() const VULKAN_HPP_NOEXCEPT - { - return m_videoSessionParametersKHR.operator bool(); - } - - bool operator!() const VULKAN_HPP_NOEXCEPT - { - return m_videoSessionParametersKHR.operator!(); - } -# endif - //=== VK_KHR_video_queue === void update( const VULKAN_HPP_NAMESPACE::VideoSessionParametersUpdateInfoKHR & updateInfo ) const; @@ -9810,8 +9146,8 @@ namespace VULKAN_HPP_NAMESPACE private: VULKAN_HPP_NAMESPACE::VideoSessionParametersKHR m_videoSessionParametersKHR; VkDevice m_device; - const VkAllocationCallbacks * m_allocator; - VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher; + const VkAllocationCallbacks * m_allocator = nullptr; + VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE::DeviceDispatcher const * m_dispatcher = nullptr; }; # endif /*VK_ENABLE_BETA_EXTENSIONS*/