Merge remote-tracking branch 'origin/1.8' into 1.8

This commit is contained in:
Wojtek Figat
2024-01-12 13:44:57 +01:00
3 changed files with 22 additions and 2 deletions

View File

@@ -297,7 +297,11 @@ Task* StreamingTexture::UpdateAllocation(int32 residency)
if (texture->Init(desc))
{
Streaming.Error = true;
LOG(Error, "Cannot allocate texture {0}.", texture->GetName());
#if GPU_ENABLE_RESOURCE_NAMING
LOG(Error, "Cannot allocate texture {0}", texture->GetName());
#else
LOG(Error, "Cannot allocate texture");
#endif
}
if (allocatedResidency != 0)
{

View File

@@ -58,7 +58,7 @@ public class TextureTool : EngineModule
options.PrivateDependencies.Add("bc7enc16");
}
}
if (options.Target.IsEditor && options.Platform.Target != TargetPlatform.Linux) // TODO: add ASTC for Editor on Linux
if (options.Target.IsEditor && astc.IsSupported(options))
{
// ASTC for mobile (iOS and Android)
options.SourceFiles.Add(Path.Combine(FolderPath, "TextureTool.astc.cpp"));

View File

@@ -8,6 +8,22 @@ using Flax.Build.NativeCpp;
/// </summary>
public class astc : DepsModule
{
/// <summary>
/// Returns true if can use astc lib for a given build setup.
/// </summary>
public static bool IsSupported(BuildOptions options)
{
switch (options.Platform.Target)
{
case TargetPlatform.Windows:
return true;
case TargetPlatform.Mac:
return options.Architecture == TargetArchitecture.ARM64;
default:
return false;
}
}
/// <inheritdoc />
public override void Init()
{