redstrate/prism
Archived
1
Fork 0
Code Activity

Fix image layout transistions for mipmap gen

Browse source
This commit is contained in:
redstrate 2021-06-01 11:10:58 -04:00
parent e55a71402f
commit f69d7c18fd
2 changed files with 43 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
engine/gfx/vulkan/src/gfx_vulkan.cpp
View file

@ -1522,14 +1522,16 @@ void GFXVulkan::submit(GFXCommandBuffer* command_buffer, const int identifier) {
int mip_width = texture->width; int mip_width = texture->width;
int mip_height = texture->height; int mip_height = texture->height;
for (int i = 1; i < command.data.generate_mipmaps.mip_count; i++) { // prepare source level
{
VkImageSubresourceRange range = {}; VkImageSubresourceRange range = {};
range.layerCount = 1; range.layerCount = 1;
range.baseArrayLayer = l; range.baseArrayLayer = l;
range.baseMipLevel = i - 1; range.baseMipLevel = 0;
range.levelCount = 1; range.levelCount = 1;
range.aspectMask = texture->aspect; range.aspectMask = texture->aspect;
// change previous mip level to SRC for copy
inlineTransitionImageLayout(cmd, inlineTransitionImageLayout(cmd,
texture->handle, texture->handle,
texture->format, texture->format,
@ -1537,6 +1539,24 @@ void GFXVulkan::submit(GFXCommandBuffer* command_buffer, const int identifier) {
range, range,
texture->layout, texture->layout,
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
}
for (int i = 1; i < command.data.generate_mipmaps.mip_count; i++) {
VkImageSubresourceRange range = {};
range.layerCount = 1;
range.baseArrayLayer = l;
range.baseMipLevel = i;
range.levelCount = 1;
range.aspectMask = texture->aspect;
// change mip level to DST for copy
inlineTransitionImageLayout(cmd,
texture->handle,
texture->format,
texture->aspect,
range,
texture->layout,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
VkImageBlit blit = {}; VkImageBlit blit = {};
blit.srcOffsets[1] = {mip_width, mip_height, 1}; blit.srcOffsets[1] = {mip_width, mip_height, 1};
@ -1551,6 +1571,7 @@ void GFXVulkan::submit(GFXCommandBuffer* command_buffer, const int identifier) {
blit.dstSubresource.baseArrayLayer = l; blit.dstSubresource.baseArrayLayer = l;
blit.dstSubresource.layerCount = 1; blit.dstSubresource.layerCount = 1;
// blit from src->dst
vkCmdBlitImage(cmd, vkCmdBlitImage(cmd,
texture->handle, texture->handle,
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
@ -1560,13 +1581,14 @@ void GFXVulkan::submit(GFXCommandBuffer* command_buffer, const int identifier) {
&blit, &blit,
VK_FILTER_LINEAR); VK_FILTER_LINEAR);
// change THIS mip level to SRC because we will use it in the next for copying
inlineTransitionImageLayout(cmd, inlineTransitionImageLayout(cmd,
texture->handle, texture->handle,
texture->format, texture->format,
texture->aspect, texture->aspect,
range, range,
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
texture->layout); VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
if(mip_width > 1) if(mip_width > 1)
mip_width /= 2; mip_width /= 2;
@ -1574,6 +1596,22 @@ void GFXVulkan::submit(GFXCommandBuffer* command_buffer, const int identifier) {
if(mip_height > 1) if(mip_height > 1)
mip_height /= 2; mip_height /= 2;
} }
// transitions all from src->previous layout
VkImageSubresourceRange range = {};
range.layerCount = 1;
range.baseArrayLayer = l;
range.baseMipLevel = 0;
range.levelCount = command.data.generate_mipmaps.mip_count;
range.aspectMask = texture->aspect;
inlineTransitionImageLayout(cmd,
texture->handle,
texture->format,
texture->aspect,
range,
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
texture->layout);
} }
} }
break; break;

2
engine/renderer/src/scenecapture.cpp
View file

@ -111,7 +111,7 @@ SceneCapture::SceneCapture(GFX* gfx) {
cubeTextureInfo.width = scene_cubemap_resolution; cubeTextureInfo.width = scene_cubemap_resolution;
cubeTextureInfo.height = scene_cubemap_resolution; cubeTextureInfo.height = scene_cubemap_resolution;
cubeTextureInfo.format = GFXPixelFormat::R8G8B8A8_UNORM; cubeTextureInfo.format = GFXPixelFormat::R8G8B8A8_UNORM;
cubeTextureInfo.usage = GFXTextureUsage::Sampled | GFXTextureUsage::TransferDst; cubeTextureInfo.usage = GFXTextureUsage::Sampled | GFXTextureUsage::TransferDst | GFXTextureUsage::TransferSrc; // dst used for cubemap copy, src used for mipmap gen
cubeTextureInfo.samplingMode = SamplingMode::ClampToEdge; cubeTextureInfo.samplingMode = SamplingMode::ClampToEdge;
cubeTextureInfo.mip_count = mipLevels; cubeTextureInfo.mip_count = mipLevels;