izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

OCIO: Fix cache id crash on invalid configs.

Browse Source 
#jira UE-198255
#rb ruslan.idrisov

[CL 28876570 by eric renaudhoude in ue5-main branch]
This commit is contained in:
eric renaudhoude
2023-10-18 10:21:19 -04:00
parent daa85eb29f
commit 8773ed940e
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Engine/Plugins/Compositing/OpenColorIO/Source/OpenColorIO/Private/OpenColorIOConfiguration.cpp
View File

@@ -178,7 +178,14 @@ void UOpenColorIOConfiguration::ReloadExistingColorspaces(bool bForce)
if (Config && Config->IsValid())
{
FString LoadedConfigHash = Config->GetCacheID() + FString(OpenColorIOWrapper::GetVersion());
FString LoadedConfigHash = Config->GetCacheID();
if (LoadedConfigHash.IsEmpty())
{
UE_LOG(LogOpenColorIO, Warning, TEXT("Failed to get cache ID: forcing constant transform recreation. Please fix invalid config."));
bForce = true;
}
LoadedConfigHash += FString(OpenColorIOWrapper::GetVersion());
const UOpenColorIOSettings* Settings = GetDefault<UOpenColorIOSettings>();
if (Settings->bSupportInverseViewTransforms)

33
Engine/Source/Developer/OpenColorIOWrapper/Private/OpenColorIOWrapper.cpp
View File

@@ -22,6 +22,7 @@ THIRD_PARTY_INCLUDES_END
#if PLATFORM_EXCEPTIONS_DISABLED
#define OCIO_EXCEPTION_HANDLING_TRY()
#define OCIO_EXCEPTION_HANDLING_CATCH(Verbosity, Format, ...) (0)
#define OCIO_EXCEPTION_HANDLING_CATCH_ERROR()
#else
#define OCIO_EXCEPTION_HANDLING_TRY() \
try {
@@ -31,6 +32,8 @@ THIRD_PARTY_INCLUDES_END
} catch (OCIO_NAMESPACE::Exception& Exc) { \
UE_LOG(LogOpenColorIOWrapper, Verbosity, Format, ##__VA_ARGS__, StringCast<TCHAR>(Exc.what()).Get()); \
}
#define OCIO_EXCEPTION_HANDLING_CATCH_ERROR() OCIO_EXCEPTION_HANDLING_CATCH(Error, TEXT("%s"))
#endif
namespace OpenColorIOWrapper
@@ -300,10 +303,12 @@ FString FOpenColorIOWrapperConfig::GetDisplayViewTransformName(const TCHAR* InDi
FString FOpenColorIOWrapperConfig::GetCacheID() const
{
if (IsValid())
{
return StringCast<TCHAR>(Pimpl->Config->getCacheID()).Get();
}
OCIO_EXCEPTION_HANDLING_TRY();
if (IsValid())
{
return StringCast<TCHAR>(Pimpl->Config->getCacheID()).Get();
}
OCIO_EXCEPTION_HANDLING_CATCH_ERROR();
return {};
}
@@ -863,10 +868,12 @@ bool FOpenColorIOWrapperProcessor::IsValid() const
FString FOpenColorIOWrapperProcessor::GetCacheID() const
{
if (IsValid())
{
return StringCast<TCHAR>(Pimpl->Processor->getCacheID()).Get();
}
OCIO_EXCEPTION_HANDLING_TRY();
if (IsValid())
{
return StringCast<TCHAR>(Pimpl->Processor->getCacheID()).Get();
}
OCIO_EXCEPTION_HANDLING_CATCH_ERROR()
return {};
}
@@ -1123,10 +1130,12 @@ bool FOpenColorIOWrapperGPUProcessor::GetTexture(uint32 InIndex, FName& OutName,
FString FOpenColorIOWrapperGPUProcessor::GetCacheID() const
{
if (IsValid())
{
return StringCast<TCHAR>(GPUPimpl->Processor->getCacheID()).Get();
}
OCIO_EXCEPTION_HANDLING_TRY();
if (IsValid())
{
return StringCast<TCHAR>(GPUPimpl->Processor->getCacheID()).Get();
}
OCIO_EXCEPTION_HANDLING_CATCH_ERROR()
return {};
}