Skip to content

Commit a2ccc90

Browse files
committed
Move common params out from ETC1S case.
1 parent 1f085d3 commit a2ccc90

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

lib/basis_encode.cpp

+8-7
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,14 @@ ktxTexture2_CompressBasisEx(ktxTexture2* This, ktxBasisParams* params)
604604
g_cpu_supports_sse41 = false;
605605
#endif
606606

607+
ktx_uint32_t transfer = KHR_DFDVAL(BDB, TRANSFER);
608+
if (transfer == KHR_DF_TRANSFER_SRGB)
609+
cparams.m_perceptual = true;
610+
else
611+
cparams.m_perceptual = false;
612+
613+
cparams.m_mip_gen = false; // We provide the mip levels.
614+
607615
cparams.m_uastc = params->uastc;
608616
if (params->uastc) {
609617
cparams.m_pack_uastc_flags = params->uastcFlags;
@@ -631,13 +639,6 @@ ktxTexture2_CompressBasisEx(ktxTexture2* This, ktxBasisParams* params)
631639
}
632640
} else {
633641
// ETC1S-related params.
634-
ktx_uint32_t transfer = KHR_DFDVAL(BDB, TRANSFER);
635-
if (transfer == KHR_DF_TRANSFER_SRGB)
636-
cparams.m_perceptual = true;
637-
else
638-
cparams.m_perceptual = false;
639-
640-
cparams.m_mip_gen = false; // We provide the mip levels.
641642

642643
// Explicit specification is required as 0 is a valid value
643644
// in the basis_compressor leaving us without a good way to

0 commit comments

Comments
 (0)