GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 1.10

Browse Source 
# Conflicts:
#	Source/Engine/Graphics/Materials/MaterialShader.h
This commit is contained in:
Wojtek Figat
2025-02-18 09:19:59 +01:00
parent d501018feb c81ddd09cc
commit a6fb651ff4
133 changed files with 2253 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Engine/Particles/Particles.cpp
View File

@@ -1069,7 +1069,6 @@ void UpdateGPU(RenderTask* task, GPUContext* context)
ScopeLock lock(GpuUpdateListLocker);
if (GpuUpdateList.IsEmpty())
return;
PROFILE_GPU("GPU Particles");
for (ParticleEffect* effect : GpuUpdateList)
@@ -1109,6 +1108,7 @@ void UpdateGPU(RenderTask* task, GPUContext* context)
ParticleBuffer* Particles::AcquireParticleBuffer(ParticleEmitter* emitter)
{
PROFILE_CPU();
ParticleBuffer* result = nullptr;
ASSERT(emitter && emitter->IsLoaded());
@@ -1118,7 +1118,7 @@ ParticleBuffer* Particles::AcquireParticleBuffer(ParticleEmitter* emitter)
const auto entries = Pool.TryGet(emitter);
if (entries)
{
while (entries->HasItems())
while (entries->HasItems() && !result)
{
// Reuse buffer
result = entries->Last().Buffer;
@@ -1129,11 +1129,6 @@ ParticleBuffer* Particles::AcquireParticleBuffer(ParticleEmitter* emitter)
{
Delete(result);
result = nullptr;
if (entries->IsEmpty())
{
Pool.Remove(emitter);
break;
}
}
}
}
@@ -1162,6 +1157,7 @@ ParticleBuffer* Particles::AcquireParticleBuffer(ParticleEmitter* emitter)
void Particles::RecycleParticleBuffer(ParticleBuffer* buffer)
{
PROFILE_CPU();
if (buffer->Emitter->EnablePooling && EnableParticleBufferPooling)
{
// Return to pool
@@ -1182,6 +1178,7 @@ void Particles::RecycleParticleBuffer(ParticleBuffer* buffer)
void Particles::OnEmitterUnload(ParticleEmitter* emitter)
{
PROFILE_CPU();
PoolLocker.Lock();
const auto entries = Pool.TryGet(emitter);
if (entries)