Mirrors/bimg
1
0
Fork 0
mirror of https://github.com/bkaradzic/bimg.git synced 2026-02-17 20:52:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

texturec: Allow pass thru texture to change format.

Browse Source
This commit is contained in:
Branimir Karadžić
2017-11-21 17:39:36 -08:00
parent 7cc14e99a1
commit 886ba55a25
4 changed files with 127 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/texturec/texturec.cpp
View File

@@ -148,7 +148,6 @@ bimg::ImageContainer* convert(bx::AllocatorI* _allocator, const void* _inputData
;
const bool passThru = true
&& inputFormat == outputFormat
&& !needResize
&& (1 < input->m_numMips) == _options.mips
&& !_options.sdf
@@ -183,7 +182,16 @@ bimg::ImageContainer* convert(bx::AllocatorI* _allocator, const void* _inputData
if (passThru)
{
output = bimg::imageConvert(_allocator, outputFormat, *input);
if (inputFormat != outputFormat
&& bimg::isCompressed(outputFormat) )
{
output = bimg::imageEncode(_allocator, outputFormat, _options.quality, *input);
}
else
{
output = bimg::imageConvert(_allocator, outputFormat, *input);
}
bimg::imageFree(input);
return output;
}