claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use temporary command buffers for submitting image layout transitions

Browse source
This commit is contained in:
saschawillems 2016-05-14 19:19:12 +02:00
parent d7ea2c2ef8
commit 2a05de5882
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
shadowmapping/shadowmapping.cpp
View file

@ -196,8 +196,6 @@ public:
// the offscreen framebuffer // the offscreen framebuffer
void prepareTextureTarget(uint32_t width, uint32_t height, VkFormat format) void prepareTextureTarget(uint32_t width, uint32_t height, VkFormat format)
{ {
createSetupCommandBuffer();
VkResult err; VkResult err;
// Get device properites for the requested texture format // Get device properites for the requested texture format
@ -236,14 +234,18 @@ public:
err = vkBindImageMemory(device, offScreenFrameBuf.textureTarget.image, offScreenFrameBuf.textureTarget.deviceMemory, 0); err = vkBindImageMemory(device, offScreenFrameBuf.textureTarget.image, offScreenFrameBuf.textureTarget.deviceMemory, 0);
assert(!err); assert(!err);
VkCommandBuffer layoutCmd = VulkanExampleBase::createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
offScreenFrameBuf.textureTarget.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; offScreenFrameBuf.textureTarget.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
vkTools::setImageLayout( vkTools::setImageLayout(
setupCmdBuffer, layoutCmd,
offScreenFrameBuf.textureTarget.image, offScreenFrameBuf.textureTarget.image,
VK_IMAGE_ASPECT_DEPTH_BIT, VK_IMAGE_ASPECT_DEPTH_BIT,
VK_IMAGE_LAYOUT_PREINITIALIZED, VK_IMAGE_LAYOUT_PREINITIALIZED,
offScreenFrameBuf.textureTarget.imageLayout); offScreenFrameBuf.textureTarget.imageLayout);
VulkanExampleBase::flushCommandBuffer(layoutCmd, queue, true);
// Create sampler // Create sampler
VkSamplerCreateInfo sampler = vkTools::initializers::samplerCreateInfo(); VkSamplerCreateInfo sampler = vkTools::initializers::samplerCreateInfo();
sampler.magFilter = TEX_FILTER; sampler.magFilter = TEX_FILTER;
@ -271,8 +273,6 @@ public:
view.image = offScreenFrameBuf.textureTarget.image; view.image = offScreenFrameBuf.textureTarget.image;
err = vkCreateImageView(device, &view, nullptr, &offScreenFrameBuf.textureTarget.view); err = vkCreateImageView(device, &view, nullptr, &offScreenFrameBuf.textureTarget.view);
assert(!err); assert(!err);
flushSetupCommandBuffer();
} }
// Set up a separate render pass for the offscreen frame buffer // Set up a separate render pass for the offscreen frame buffer
@ -332,8 +332,6 @@ public:
void prepareOffscreenFramebuffer() void prepareOffscreenFramebuffer()
{ {
createSetupCommandBuffer();
offScreenFrameBuf.width = FB_DIM; offScreenFrameBuf.width = FB_DIM;
offScreenFrameBuf.height = FB_DIM; offScreenFrameBuf.height = FB_DIM;
@ -377,11 +375,13 @@ public:
getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &memAlloc.memoryTypeIndex); getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &memAlloc.memoryTypeIndex);
err = vkAllocateMemory(device, &memAlloc, nullptr, &offScreenFrameBuf.color.mem); err = vkAllocateMemory(device, &memAlloc, nullptr, &offScreenFrameBuf.color.mem);
assert(!err); assert(!err);
err = vkBindImageMemory(device, offScreenFrameBuf.color.image, offScreenFrameBuf.color.mem, 0); err = vkBindImageMemory(device, offScreenFrameBuf.color.image, offScreenFrameBuf.color.mem, 0);
assert(!err); assert(!err);
VkCommandBuffer layoutCmd = VulkanExampleBase::createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkTools::setImageLayout( vkTools::setImageLayout(
setupCmdBuffer, layoutCmd,
offScreenFrameBuf.color.image, offScreenFrameBuf.color.image,
VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_ASPECT_COLOR_BIT,
VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_UNDEFINED,
@ -418,12 +418,14 @@ public:
assert(!err); assert(!err);
vkTools::setImageLayout( vkTools::setImageLayout(
setupCmdBuffer, layoutCmd,
offScreenFrameBuf.depth.image, offScreenFrameBuf.depth.image,
VK_IMAGE_ASPECT_DEPTH_BIT, VK_IMAGE_ASPECT_DEPTH_BIT,
VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_UNDEFINED,
VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL); VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
VulkanExampleBase::flushCommandBuffer(layoutCmd, queue, true);
depthStencilView.image = offScreenFrameBuf.depth.image; depthStencilView.image = offScreenFrameBuf.depth.image;
err = vkCreateImageView(device, &depthStencilView, nullptr, &offScreenFrameBuf.depth.view); err = vkCreateImageView(device, &depthStencilView, nullptr, &offScreenFrameBuf.depth.view);
assert(!err); assert(!err);
@ -445,8 +447,6 @@ public:
err = vkCreateFramebuffer(device, &fbufCreateInfo, nullptr, &offScreenFrameBuf.frameBuffer); err = vkCreateFramebuffer(device, &fbufCreateInfo, nullptr, &offScreenFrameBuf.frameBuffer);
assert(!err); assert(!err);
flushSetupCommandBuffer();
} }
void buildOffscreenCommandBuffer() void buildOffscreenCommandBuffer()