OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fix crash when building the accel struct for scenes with no level mesh

Browse source
This commit is contained in:
Magnus Norddahl 2025-01-27 21:21:14 +01:00
commit 0d976d35c5
6 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -227,6 +227,9 @@ void VulkanRenderDevice::InitializeState()
uniformblockalignment = (unsigned int)mDevice->PhysicalDevice.Properties.Properties.limits.minUniformBufferOffsetAlignment;
maxuniformblock = std::min(mDevice->PhysicalDevice.Properties.Properties.limits.maxUniformBufferRange, (uint32_t)1024 * 1024);
NullMesh.reset(new LevelMesh());
levelMesh = NullMesh.get();
mCommands.reset(new VkCommandBufferManager(this));
mSamplerManager.reset(new VkSamplerManager(this));
@ -521,8 +524,7 @@ void VulkanRenderDevice::BeginFrame()
{
levelMeshChanged = false;
mLevelMesh->SetLevelMesh(levelMesh);
if (levelMesh)
GetTextureManager()->CreateLightmap(levelMesh->Lightmap.TextureSize, levelMesh->Lightmap.TextureCount, std::move(levelMesh->Lightmap.TextureData));
GetTextureManager()->CreateLightmap(levelMesh->Lightmap.TextureSize, levelMesh->Lightmap.TextureCount, std::move(levelMesh->Lightmap.TextureData));
GetLightmapper()->SetLevelMesh(levelMesh);
}
@ -586,6 +588,11 @@ void VulkanRenderDevice::PrintStartupLog()
void VulkanRenderDevice::SetLevelMesh(LevelMesh* mesh)
{
if (!mesh) // Vulkan must have a mesh for its data structures in shaders to remain sane
{
NullMesh.reset(new LevelMesh()); // we must have a completely new mesh here as the upload ranges needs to reset as well
mesh = NullMesh.get();
}
levelMesh = mesh;
levelMeshChanged = true;
}