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

Code style cleanup

Browse Source 
#837
This commit is contained in:
Wojtek Figat
2022-11-28 23:35:27 +01:00
parent 853fa482f6
commit 3f3697fbfa
4 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Engine/Tools/TextureTool/TextureTool.DirectXTex.cpp
View File

@@ -624,16 +624,12 @@ bool TextureTool::ImportTextureDirectXTex(ImageType type, const StringView& path
}
bool bKeepAsIs = false;
if (!options.FlipY &&options.Compress && type == ImageType::DDS && mipLevels == sourceMipLevels && DirectX::IsCompressed(sourceDxgiFormat))
if (!options.FlipY && options.Compress && type == ImageType::DDS && mipLevels == sourceMipLevels && DirectX::IsCompressed(sourceDxgiFormat) && !DirectX::IsSRGB(sourceDxgiFormat))
{
if (!DirectX::IsSRGB(sourceDxgiFormat))
{
// PE: Keep image in the current compressed format (artist choice) so we dont have to run the slow mipmap generation.
// PE: Also converting a BC1 normal map to BC5 will not improve it but just use double gpu mem.
bKeepAsIs = true;
targetDxgiFormat = sourceDxgiFormat;
targetFormat = ToPixelFormat(currentImage->GetMetadata().format);
}
// Keep image in the current compressed format (artist choice) so we don't have to run the slow mipmap generation
bKeepAsIs = true;
targetDxgiFormat = sourceDxgiFormat;
targetFormat = ToPixelFormat(currentImage->GetMetadata().format);
}
// Decompress if texture is compressed (next steps need decompressed input data, for eg. mip maps generation or format changing)
@@ -897,7 +893,7 @@ bool TextureTool::ConvertDirectXTex(TextureData& dst, const TextureData& src, co
return true;
}
}
// Check if convert data
// Check if convert data
else if (inImage->GetMetadata().format != dstFormatDxgi)
{
result = DirectX::Convert(inImage->GetImages(), inImage->GetImageCount(), inImage->GetMetadata(), dstFormatDxgi, DirectX::TEX_FILTER_DEFAULT, DirectX::TEX_THRESHOLD_DEFAULT, dstImage);