zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-22 01:11:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reuse lightmap baking textures between calls to Raytrace

Browse source
This commit is contained in:
Magnus Norddahl 2023-09-04 14:39:11 +02:00 committed by Christoph Oelckers
parent fd4496f360
commit bfc5684e0c
2 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/common/rendering/vulkan/accelstructs/vk_lightmap.cpp
View file

@ -32,10 +32,15 @@ VkLightmap::~VkLightmap()
void VkLightmap::Raytrace(LevelMesh* level) void VkLightmap::Raytrace(LevelMesh* level)
{ {
bool newLevel = (mesh != level);
mesh = level; mesh = level;
UpdateAccelStructDescriptors(); if (newLevel)
CreateAtlasImages(); {
UpdateAccelStructDescriptors();
CreateAtlasImages();
}
UploadUniforms(); UploadUniforms();
for (size_t pageIndex = 0; pageIndex < atlasImages.size(); pageIndex++) for (size_t pageIndex = 0; pageIndex < atlasImages.size(); pageIndex++)
@ -47,21 +52,6 @@ void VkLightmap::Raytrace(LevelMesh* level)
{ {
ResolveAtlasImage(pageIndex); ResolveAtlasImage(pageIndex);
} }
for (LightmapImage& image : atlasImages)
{
fb->GetCommands()->TransferDeleteList->Add(std::move(image.raytrace.Image));
fb->GetCommands()->TransferDeleteList->Add(std::move(image.raytrace.View));
fb->GetCommands()->TransferDeleteList->Add(std::move(image.raytrace.Framebuffer));
fb->GetCommands()->TransferDeleteList->Add(std::move(image.resolve.Image));
fb->GetCommands()->TransferDeleteList->Add(std::move(image.resolve.View));
fb->GetCommands()->TransferDeleteList->Add(std::move(image.resolve.Framebuffer));
}
atlasImages.clear();
for (auto& set : resolve.descriptorSets)
fb->GetCommands()->TransferDeleteList->Add(std::move(set));
resolve.descriptorSets.clear();
} }
void VkLightmap::RenderAtlasImage(size_t pageIndex) void VkLightmap::RenderAtlasImage(size_t pageIndex)
@ -197,7 +187,7 @@ void VkLightmap::CreateAtlasImages()
surface->lightmapperAtlasPage = (int)result.pageIndex; surface->lightmapperAtlasPage = (int)result.pageIndex;
} }
for (size_t pageIndex = 0; pageIndex < packer.getNumPages(); pageIndex++) for (size_t pageIndex = atlasImages.size(); pageIndex < packer.getNumPages(); pageIndex++)
{ {
atlasImages.push_back(CreateImage(atlasImageSize, atlasImageSize)); atlasImages.push_back(CreateImage(atlasImageSize, atlasImageSize));
} }
@ -240,14 +230,7 @@ void VkLightmap::ResolveAtlasImage(size_t pageIndex)
VkDeviceSize offset = 0; VkDeviceSize offset = 0;
cmdbuffer->bindVertexBuffers(0, 1, &vertices.Buffer->buffer, &offset); cmdbuffer->bindVertexBuffers(0, 1, &vertices.Buffer->buffer, &offset);
cmdbuffer->bindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, resolve.pipeline.get()); cmdbuffer->bindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, resolve.pipeline.get());
cmdbuffer->bindDescriptorSet(VK_PIPELINE_BIND_POINT_GRAPHICS, resolve.pipelineLayout.get(), 0, img.resolve.DescriptorSet.get());
auto descriptorSet = resolve.descriptorPool->allocate(resolve.descriptorSetLayout.get());
descriptorSet->SetDebugName("resolve.descriptorSet");
WriteDescriptors()
.AddCombinedImageSampler(descriptorSet.get(), 0, img.raytrace.View.get(), resolve.sampler.get(), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)
.Execute(fb->GetDevice());
cmdbuffer->bindDescriptorSet(VK_PIPELINE_BIND_POINT_GRAPHICS, resolve.pipelineLayout.get(), 0, descriptorSet.get());
resolve.descriptorSets.push_back(std::move(descriptorSet));
VkViewport viewport = {}; VkViewport viewport = {};
viewport.maxDepth = 1; viewport.maxDepth = 1;
@ -586,6 +569,13 @@ LightmapImage VkLightmap::CreateImage(int width, int height)
.DebugName("LightmapImage.resolve.Framebuffer") .DebugName("LightmapImage.resolve.Framebuffer")
.Create(fb->GetDevice()); .Create(fb->GetDevice());
img.resolve.DescriptorSet = resolve.descriptorPool->allocate(resolve.descriptorSetLayout.get());
img.resolve.DescriptorSet->SetDebugName("resolve.descriptorSet");
WriteDescriptors()
.AddCombinedImageSampler(img.resolve.DescriptorSet.get(), 0, img.raytrace.View.get(), resolve.sampler.get(), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)
.Execute(fb->GetDevice());
return img; return img;
} }

2
src/common/rendering/vulkan/accelstructs/vk_lightmap.h
View file

@ -45,6 +45,7 @@ struct LightmapImage
std::unique_ptr<VulkanImage> Image; std::unique_ptr<VulkanImage> Image;
std::unique_ptr<VulkanImageView> View; std::unique_ptr<VulkanImageView> View;
std::unique_ptr<VulkanFramebuffer> Framebuffer; std::unique_ptr<VulkanFramebuffer> Framebuffer;
std::unique_ptr<VulkanDescriptorSet> DescriptorSet;
} resolve; } resolve;
}; };
@ -159,7 +160,6 @@ private:
std::unique_ptr<VulkanPipeline> pipeline; std::unique_ptr<VulkanPipeline> pipeline;
std::unique_ptr<VulkanRenderPass> renderPass; std::unique_ptr<VulkanRenderPass> renderPass;
std::unique_ptr<VulkanDescriptorPool> descriptorPool; std::unique_ptr<VulkanDescriptorPool> descriptorPool;
std::vector<std::unique_ptr<VulkanDescriptorSet>> descriptorSets;
std::unique_ptr<VulkanSampler> sampler; std::unique_ptr<VulkanSampler> sampler;
} resolve; } resolve;