redstrate/prism
Archived
1
Fork 0
Code Activity

Implement GenerateMipmaps command in Vulkan

Browse source
This commit is contained in:
redstrate 2021-05-12 10:29:29 -04:00
parent 4ebd53d89f
commit de928a44ce
2 changed files with 66 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1485,6 +1485,69 @@ void GFXVulkan::submit(GFXCommandBuffer* command_buffer, const int identifier) {
cmd_debug_marker_end(device, cmd); cmd_debug_marker_end(device, cmd);
} }
break; break;
case GFXCommandType::GenerateMipmaps:
{
auto texture = static_cast<GFXVulkanTexture*>(command.data.generate_mipmaps.texture);
for(int l = 0; l < texture->range.layerCount; l++) {
int mip_width = texture->width;
int mip_height = texture->height;
for (int i = 1; i < command.data.generate_mipmaps.mip_count; i++) {
VkImageSubresourceRange range = {};
range.layerCount = 1;
range.baseArrayLayer = l;
range.baseMipLevel = i - 1;
range.levelCount = 1;
range.aspectMask = texture->aspect;
inlineTransitionImageLayout(cmd,
texture->handle,
texture->format,
texture->aspect,
range,
texture->layout,
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
VkImageBlit blit = {};
blit.srcOffsets[1] = {mip_width, mip_height, 1};
blit.srcSubresource.aspectMask = texture->aspect;
blit.srcSubresource.mipLevel = i - 1;
blit.srcSubresource.baseArrayLayer = l;
blit.srcSubresource.layerCount = 1;
blit.dstOffsets[1] = {mip_width > 1 ? mip_width / 2 : 1, mip_height > 1 ? mip_height / 2 : 1, 1};
blit.dstSubresource.aspectMask = texture->aspect;
blit.dstSubresource.mipLevel = i;
blit.dstSubresource.baseArrayLayer = l;
blit.dstSubresource.layerCount = 1;
vkCmdBlitImage(cmd,
texture->handle,
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
texture->handle,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
1,
&blit,
VK_FILTER_LINEAR);
inlineTransitionImageLayout(cmd,
texture->handle,
texture->format,
texture->aspect,
range,
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
texture->layout);
if(mip_width > 1)
mip_width /= 2;
if(mip_height > 1)
mip_height /= 2;
}
}
}
break;
default: default:
prism::log::error(System::GFX, "Unhandled GFX Command Type {}", utility::enum_to_string(command.type)); prism::log::error(System::GFX, "Unhandled GFX Command Type {}", utility::enum_to_string(command.type));
break; break;

6
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; cubeTextureInfo.usage = GFXTextureUsage::Sampled | GFXTextureUsage::TransferDst;
cubeTextureInfo.samplingMode = SamplingMode::ClampToEdge; cubeTextureInfo.samplingMode = SamplingMode::ClampToEdge;
cubeTextureInfo.mip_count = mipLevels; cubeTextureInfo.mip_count = mipLevels;
@ -134,7 +134,7 @@ void SceneCapture::create_scene_resources(Scene& scene) {
cubeTextureInfo.width = irradiance_cubemap_resolution; cubeTextureInfo.width = irradiance_cubemap_resolution;
cubeTextureInfo.height = irradiance_cubemap_resolution; cubeTextureInfo.height = irradiance_cubemap_resolution;
cubeTextureInfo.format = GFXPixelFormat::R8G8B8A8_UNORM; cubeTextureInfo.format = GFXPixelFormat::R8G8B8A8_UNORM;
cubeTextureInfo.usage = GFXTextureUsage::Sampled; cubeTextureInfo.usage = GFXTextureUsage::Sampled | GFXTextureUsage::TransferDst;
cubeTextureInfo.samplingMode = SamplingMode::ClampToEdge; cubeTextureInfo.samplingMode = SamplingMode::ClampToEdge;
cubeTextureInfo.array_length = max_environment_probes; cubeTextureInfo.array_length = max_environment_probes;
@ -146,7 +146,7 @@ void SceneCapture::create_scene_resources(Scene& scene) {
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; cubeTextureInfo.usage = GFXTextureUsage::Sampled | GFXTextureUsage::TransferDst;
cubeTextureInfo.samplingMode = SamplingMode::ClampToEdge; cubeTextureInfo.samplingMode = SamplingMode::ClampToEdge;
cubeTextureInfo.array_length = max_environment_probes; cubeTextureInfo.array_length = max_environment_probes;
cubeTextureInfo.mip_count = mipLevels; cubeTextureInfo.mip_count = mipLevels;