OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fix VkRaytrace::Raytrace not working properly if called multiple times per frame.

Browse source 
- Only call VkRaytrace::Raytrace once per scene
This commit is contained in:
Magnus Norddahl 2023-09-16 05:12:31 +02:00
commit 2178de0c6c
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,6 +61,12 @@ void VkLightmap::SetLevelMesh(LevelMesh* level)
lastSurfaceCount = 0;
}
void VkLightmap::BeginFrame()
{
lights.Pos = 0;
vertices.Pos = 0;
}
void VkLightmap::Raytrace(const TArray<LevelMeshSurface*>& surfaces)
{
if (surfaces.Size())
@ -137,9 +143,6 @@ void VkLightmap::RenderBakeImage()
cmdbuffer->bindDescriptorSet(VK_PIPELINE_BIND_POINT_GRAPHICS, raytrace.pipelineLayout.get(), 0, raytrace.descriptorSet0.get());
cmdbuffer->bindDescriptorSet(VK_PIPELINE_BIND_POINT_GRAPHICS, raytrace.pipelineLayout.get(), 1, raytrace.descriptorSet1.get());
lights.Pos = 0;
vertices.Pos = 0;
for (int i = 0, count = selectedSurfaces.Size(); i < count; i++)
{
auto& selectedSurface = selectedSurfaces[i];
@ -406,7 +409,6 @@ void VkLightmap::BlurBakeImage()
void VkLightmap::CopyBakeImageResult()
{
uint32_t pixels = 0;
uint32_t surfacesRenderer = 0;
std::set<int> seenPages;
std::vector<VkImageCopy> regions;
@ -433,11 +435,10 @@ void VkLightmap::CopyBakeImageResult()
seenPages.insert(surface->atlasPageIndex);
pixels += surface->Area();
surfacesRenderer++;
lastSurfaceCount++;
}
}
lastSurfaceCount = surfacesRenderer;
lastPixelCount = pixels;
totalPixelCount += pixels;

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

@ -98,6 +98,7 @@ public:
VkLightmap(VulkanRenderDevice* fb);
~VkLightmap();
void BeginFrame();
void Raytrace(const TArray<LevelMeshSurface*>& surfaces);
void SetLevelMesh(LevelMesh* level);

1
src/common/rendering/vulkan/vk_renderdevice.cpp
View file

@ -486,6 +486,7 @@ void VulkanRenderDevice::BeginFrame()
for (auto& renderstate : mRenderState)
renderstate->BeginFrame();
mDescriptorSetManager->BeginFrame();
mLightmap->BeginFrame();
}
void VulkanRenderDevice::Draw2D()

2
src/rendering/hwrenderer/scene/hw_drawinfo.cpp
View file

@ -415,7 +415,7 @@ void HWDrawInfo::CreateScene(bool drawpsprites, FRenderState& state)
void HWDrawInfo::UpdateLightmaps()
{
if (VisibleSurfaces.Size() < unsigned(lm_background_updates))
if (!outer && VisibleSurfaces.Size() < unsigned(lm_background_updates))
{
for (auto& e : level.levelMesh->Surfaces)
{