Copy up //UE4/Dev-Enterprise/... to //UE4/Dev-Tools-Staging/...

#rb none

[CL 10371791 by JeanLuc Corenthin in Dev-Tools-Staging branch]
This commit is contained in:
JeanLuc Corenthin
2019-11-22 10:05:55 -05:00
parent 78e9e9b689
commit 276d3af9b8
309 changed files with 3987 additions and 2780 deletions

View File

@@ -1780,6 +1780,8 @@ public:
*/
void DoWork()
{
TRACE_CPUPROFILER_EVENT_SCOPE(CompressImage);
bCompressionResults = TextureFormat.CompressImageEx(
SourceImages,
NumImages,
@@ -1831,6 +1833,8 @@ static bool CompressMipChain(
uint32& OutNumMipsInTail,
uint32& OutExtData)
{
TRACE_CPUPROFILER_EVENT_SCOPE(CompressMipChain)
// now call the Ex version now that we have the proper MipChain
const FTextureFormatCompressorCaps CompressorCaps = TextureFormat->GetFormatCapabilitiesEx(Settings, MipChain.Num(), MipChain[0]);
OutNumMipsInTail = CompressorCaps.NumMipsInTail;