OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Add some more null checks

Browse source
This commit is contained in:
Magnus Norddahl 2024-12-16 11:32:39 +01:00
commit 0d87875003
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/common/rendering/hwrenderer/data/hw_collision.cpp
View file

@ -96,11 +96,11 @@ void CPUAccelStruct::Update()
DynamicBLASTime.ResetAndClock();
InstanceCount = (Mesh->Mesh.IndexCount + IndexesPerBLAS - 1) / IndexesPerBLAS;
bool needsUpdate[32] = {};
std::vector<bool> needsUpdate(InstanceCount);
for (const MeshBufferRange& range : Mesh->UploadRanges.Index)
{
int start = range.Start / IndexesPerBLAS;
int end = (range.End + IndexesPerBLAS - 1) / IndexesPerBLAS;
int end = range.End / IndexesPerBLAS;
for (int i = start; i < end; i++)
{
needsUpdate[i] = true;
@ -158,7 +158,7 @@ void CPUAccelStruct::Upload()
// Copy the BLAS nodes to the mesh node list and remember their locations
int offset = TLAS.Nodes.size();
int instance = 0;
int blasOffsets[32] = {};
std::vector<int> blasOffsets(DynamicBLAS.size());
for (auto& blas : DynamicBLAS)
{
if (blas)
@ -225,8 +225,16 @@ void CPUAccelStruct::CreateTLAS()
Scratch.centroids.reserve(DynamicBLAS.size());
for (int i = 0; i < InstanceCount; i++)
{
Scratch.leafs.push_back(i);
Scratch.centroids.push_back(FVector4(DynamicBLAS[i]->GetBBox().Center, 1.0f));
if (DynamicBLAS[i])
{
Scratch.leafs.push_back(i);
Scratch.centroids.push_back(FVector4(DynamicBLAS[i]->GetBBox().Center, 1.0f));
}
else
{
Scratch.leafs.push_back(0);
Scratch.centroids.push_back(FVector4(-1000000.0f, -1000000.0f, -1000000.0f, 1.0f));
}
}
size_t neededbuffersize = InstanceCount * 2;