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

Fix crash when unloading texture with leftover streaming task that was idle

Browse Source
This commit is contained in:
Wojtek Figat
2025-08-02 22:03:19 +02:00
parent db660721ce
commit c9e0637b0f
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Source/Engine/Graphics/Textures/StreamingTexture.cpp
View File

@@ -197,9 +197,22 @@ public:
~StreamTextureResizeTask()
{
OnResourceReleased2();
SAFE_DELETE_GPU_RESOURCE(_newTexture);
}
private:
void OnResourceReleased2()
{
// Unlink texture
if (_streamingTexture)
{
ScopeLock lock(_streamingTexture->GetOwner()->GetOwnerLocker());
_streamingTexture->_streamingTasks.Remove(this);
_streamingTexture = nullptr;
}
}
protected:
// [GPUTask]
Result run(GPUTasksContext* context) override
@@ -225,11 +238,7 @@ protected:
void OnEnd() override
{
if (_streamingTexture)
{
ScopeLock lock(_streamingTexture->GetOwner()->GetOwnerLocker());
_streamingTexture->_streamingTasks.Remove(this);
}
OnResourceReleased2();
// Base
GPUTask::OnEnd();
@@ -336,6 +345,11 @@ public:
_texture.Released.Bind<StreamTextureMipTask, &StreamTextureMipTask::OnResourceReleased2>(this);
}
~StreamTextureMipTask()
{
OnResourceReleased2();
}
private:
void OnResourceReleased2()
{
@@ -392,12 +406,7 @@ protected:
void OnEnd() override
{
_dataLock.Release();
if (_streamingTexture)
{
ScopeLock lock(_streamingTexture->GetOwner()->GetOwnerLocker());
_streamingTexture->_streamingTasks.Remove(_rootTask);
_streamingTexture = nullptr;
}
OnResourceReleased2();
// Base
GPUUploadTextureMipTask::OnEnd();