Mirrors/StevesUEHelpers
1
0
Fork 0
mirror of https://github.com/sinbad/StevesUEHelpers.git synced 2025-02-23 17:45:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some GC problems, we need to implement FGCObject

Browse Source
This commit is contained in:
Steve Streeting 2021-11-09 16:05:12 +00:00
parent 352935bd67
commit 5ba7a841e4
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/StevesUEHelpers/Private/StevesTextureRenderTargetPool.cpp
View File

@ -29,6 +29,7 @@ void FStevesTextureRenderTargetPool::ReleaseReservation(UTextureRenderTarget2D*
UE_LOG(LogStevesUEHelpers, Verbose, TEXT("FStevesTextureRenderTargetPool: Released texture reservation on %s"), *Tex->GetName());
UnreservedTextures.Add(R.Key, Tex);
Reservations.RemoveAtSwap(i);
ReservedTextures.Remove(Tex);
return;
}
}
@ -37,8 +38,20 @@ void FStevesTextureRenderTargetPool::ReleaseReservation(UTextureRenderTarget2D*
}
FStevesTextureRenderTargetPool::~FStevesTextureRenderTargetPool()
{
DrainPool(true);
}
void FStevesTextureRenderTargetPool::AddReferencedObjects(FReferenceCollector& Collector)
{
// We need to hold on to the texture references
Collector.AddReferencedObjects(ReservedTextures);
Collector.AddReferencedObjects(UnreservedTextures);
}
FStevesTextureRenderTargetReservationPtr FStevesTextureRenderTargetPool::ReserveTexture(FIntPoint Size,
ETextureRenderTargetFormat Format, const UObject* Owner)
ETextureRenderTargetFormat Format, const UObject* Owner)
{
const FTextureKey Key {Size, Format};
UTextureRenderTarget2D* Tex = nullptr;
@ -64,6 +77,10 @@ FStevesTextureRenderTargetReservationPtr FStevesTextureRenderTargetPool::Reserve
// Record reservation
Reservations.Add(FReservationInfo(Key, Owner, Tex));
// Reservation doesn't keep the texture alive; if caller doesn't hold a strong pointer to it, it'll be destroyed
// So we need to hold it ourselves
ReservedTextures.Add(Tex);
return MakeShared<FStevesTextureRenderTargetReservation>(Tex, this->AsShared(), Owner);
}
@ -78,6 +95,7 @@ void FStevesTextureRenderTargetPool::RevokeReservations(const UObject* ForOwner)
{
UE_LOG(LogStevesUEHelpers, Verbose, TEXT("FStevesTextureRenderTargetPool: Revoked texture reservation on %s"), *R.Texture->GetName());
UnreservedTextures.Add(R.Key, R.Texture.Get());
ReservedTextures.Remove(R.Texture.Get());
}
// Can't use RemoveAtSwap because it'll change order
Reservations.RemoveAt(i);
@ -97,4 +115,6 @@ void FStevesTextureRenderTargetPool::DrainPool(bool bForceAndRevokeReservations)
UKismetRenderingLibrary::ReleaseRenderTarget2D(TexPair.Value);
}
UnreservedTextures.Empty();
ReservedTextures.Empty();
}

10
Source/StevesUEHelpers/Public/StevesTextureRenderTargetPool.h
View File

@ -40,8 +40,9 @@ public:
* these textures at runtime.
* A pool needs to be owned by a UObject, which will in turn own the textures and so will ultimately control the
* ultimate lifecycle of textures if not released specifically.
* See FCompElementRenderTargetPool for inspiration
*/
struct STEVESUEHELPERS_API FStevesTextureRenderTargetPool : public TSharedFromThis<FStevesTextureRenderTargetPool>
struct STEVESUEHELPERS_API FStevesTextureRenderTargetPool : public FGCObject, public TSharedFromThis<FStevesTextureRenderTargetPool>
{
protected:
@ -73,6 +74,7 @@ protected:
TWeakObjectPtr<UObject> PoolOwner;
TMultiMap<FTextureKey, UTextureRenderTarget2D*> UnreservedTextures;
TSet<UTextureRenderTarget2D*> ReservedTextures;
/// Weak reverse tracking of reservations, mostly for debugging
struct FReservationInfo
@ -95,7 +97,6 @@ protected:
/// Release a reservation on a texture, allowing it back into the pool
/// Protected because only FStevesTextureRenderTargetReservation will need to do this.
void ReleaseReservation(UTextureRenderTarget2D* Tex);
public:
explicit FStevesTextureRenderTargetPool(const FName& InName, UObject* InOwner)
@ -103,8 +104,13 @@ public:
{
}
virtual ~FStevesTextureRenderTargetPool() override;
const FName& GetName() const { return Name; }
// FGCObject
virtual void AddReferencedObjects(FReferenceCollector& Collector) override;
/**
* Reserve a texture for use as a render target. This will create a new texture target if needed.
* @param Size The dimensions of the texture