mewin/vulkan-hpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve some validation layer warnings in some samples. (#1640)

Browse Source
This commit is contained in:
Andreas Süßenbach
2023-08-17 14:28:39 +02:00
committed by GitHub
parent 57d54a0ba6
commit d07d082af1
8 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/13_InitVertexBuffer/13_InitVertexBuffer.cpp
View File

@@ -104,8 +104,8 @@ int main( int /*argc*/, char ** /*argv*/ )
vk::su::submitAndWait( device, graphicsQueue, commandBuffer );
device.destroySemaphore( imageAcquiredSemaphore );
device.destroyBuffer( vertexBuffer ); // destroy the buffer before the bound device memory to prevent some validation layer warning
device.freeMemory( deviceMemory );
device.destroyBuffer( vertexBuffer );
/* VULKAN_KEY_END */

12
samples/CopyBlitImage/CopyBlitImage.cpp
View File

@@ -144,15 +144,16 @@ int main( int /*argc*/, char ** /*argv*/ )
// Do a 32x32 blit to all of the dst image - should get big squares
vk::ImageSubresourceLayers imageSubresourceLayers( vk::ImageAspectFlagBits::eColor, 0, 0, 1 );
vk::ImageBlit imageBlit( imageSubresourceLayers,
{ { vk::Offset3D( 0, 0, 0 ), vk::Offset3D( 32, 32, 1 ) } },
{ { vk::Offset3D( 0, 0, 0 ), vk::Offset3D( 32, 32, 1 ) } },
imageSubresourceLayers,
{ { vk::Offset3D( 0, 0, 0 ), vk::Offset3D( surfaceData.extent.width, surfaceData.extent.height, 1 ) } } );
{ { vk::Offset3D( 0, 0, 0 ), vk::Offset3D( surfaceData.extent.width, surfaceData.extent.height, 1 ) } } );
commandBuffer.blitImage(
blitSourceImage, vk::ImageLayout::eTransferSrcOptimal, blitDestinationImage, vk::ImageLayout::eTransferDstOptimal, imageBlit, vk::Filter::eLinear );
// Use a barrier to make sure the blit is finished before the copy starts
// Note: for a layout of vk::ImageLayout::eTransferDstOptimal, the access mask is supposed to be vk::AccessFlagBits::eTransferWrite
vk::ImageMemoryBarrier memoryBarrier( vk::AccessFlagBits::eTransferWrite,
vk::AccessFlagBits::eMemoryRead,
vk::AccessFlagBits::eTransferWrite,
vk::ImageLayout::eTransferDstOptimal,
vk::ImageLayout::eTransferDstOptimal,
VK_QUEUE_FAMILY_IGNORED,
@@ -166,8 +167,9 @@ int main( int /*argc*/, char ** /*argv*/ )
vk::ImageCopy imageCopy( imageSubresourceLayers, vk::Offset3D(), imageSubresourceLayers, vk::Offset3D( 256, 256, 0 ), vk::Extent3D( 128, 128, 1 ) );
commandBuffer.copyImage( blitSourceImage, vk::ImageLayout::eTransferSrcOptimal, blitDestinationImage, vk::ImageLayout::eTransferDstOptimal, imageCopy );
// Note: for a layout of vk::ImageLayout::ePresentSrcKHR, the access mask is supposed to be empty
vk::ImageMemoryBarrier prePresentBarrier( vk::AccessFlagBits::eTransferWrite,
vk::AccessFlagBits::eMemoryRead,
{},
vk::ImageLayout::eTransferDstOptimal,
vk::ImageLayout::ePresentSrcKHR,
VK_QUEUE_FAMILY_IGNORED,
@@ -200,8 +202,8 @@ int main( int /*argc*/, char ** /*argv*/ )
device.destroyFence( drawFence );
device.destroyFence( commandFence );
device.destroyImage( blitSourceImage ); // destroy the image before the bound device memory to prevent some validation layer warning
device.freeMemory( deviceMemory );
device.destroyImage( blitSourceImage );
device.destroySemaphore( imageAcquiredSemaphore );
swapChainData.clear( device );
device.freeCommandBuffers( commandPool, commandBuffer );

2
samples/InitTexture/InitTexture.cpp
View File

@@ -186,8 +186,8 @@ int main( int /*argc*/, char ** /*argv*/ )
device.destroySampler( sampler );
device.freeMemory( textureBufferMemory );
device.destroyBuffer( textureBuffer );
device.destroyImage( image ); // destroy the image before the bound device memory to prevent some validation layer warning
device.freeMemory( imageMemory );
device.destroyImage( image );
device.freeCommandBuffers( commandPool, commandBuffer );
device.destroyCommandPool( commandPool );
device.destroy();