KhronosGroup · MarkCallow · Feb 17, 2022 · Oct 14, 2021 · Oct 19, 2021 · Nov 9, 2021
diff --git a/include/ktx.h b/include/ktx.h
@@ -1301,12 +1301,8 @@ typedef struct ktxBasisParams {
              selector RDO, no endpoint RDO). Only valid for linear textures.
          */
     ktx_bool_t separateRGToRGB_A;
-        /*!< Separates the input R and G channels to RGB and A (for tangent
-             space XY normal maps). Equivalent to @c inputSwizzle "rrrg".
-             Separation is the default for 2 component textures. If both this
-             and inputSwizzle are set, the latter wins therefore set
-             @c inputSwizzle to change the default for 2 component
-             textures.
+        /*!< @deprecated. This was and is a no-op. 2-component inputs have always been
+             automatically separated using an "rrrg" inputSwizzle. @sa inputSwizzle and normalMode.
          */
     ktx_bool_t preSwizzle;
         /*!< If the texture has @c KTXswizzle metadata, apply it before

diff --git a/lib/astc_encode.cpp b/lib/astc_encode.cpp
@@ -211,7 +211,6 @@ static ktxAstcParams
 astcDefaultOptions() {
     ktxAstcParams params{};
     params.structSize = sizeof(params);
-    params.verbose = false;
     params.threadCount = 1;
     params.blockDimension = KTX_PACK_ASTC_BLOCK_DIMENSION_6x6;
     params.mode = KTX_PACK_ASTC_ENCODER_MODE_LDR;
@@ -619,18 +618,14 @@ ktxTexture2_CompressAstcEx(ktxTexture2* This, ktxAstcParams* params) {
                                                    quality, flags,
                                                    &astc_config);
 
-    if (astc_error != ASTCENC_SUCCESS) {
-        std::cout << "ASTC config init failed with error " << astcenc_get_error_string(astc_error) << std::endl;
+    if (astc_error != ASTCENC_SUCCESS)
         return KTX_INVALID_OPERATION;
-    }
 
     astc_error  = astcenc_context_alloc(&astc_config, threadCount,
                                         &astc_context);
 
-    if (astc_error != ASTCENC_SUCCESS) {
-        std::cout << "ASTC context alloc failed with error " << astcenc_get_error_string(astc_error) << std::endl;
+    if (astc_error != ASTCENC_SUCCESS)
         return KTX_INVALID_OPERATION;
-    }
 
     // Walk in reverse on levels so we don't have to do this later
     assert(prototype->dataSize && "Prototype texture size not initialized.\n");
@@ -657,12 +652,6 @@ ktxTexture2_CompressAstcEx(ktxTexture2* This, ktxAstcParams* params) {
         ktx_size_t offset = ktxTexture2_levelDataOffset(This, level);
 
         for (uint32_t image = 0; image < levelImages; image++) {
-            if (params->verbose)
-                std::cout << "ASTC compressor: compressing image " <<
-                             (This->numLevels - level - 1) * levelImages + image + 1
-                             << " of " << This->numLevels * levelImages
-                             << std::endl;
-
             astcenc_image *input_image = nullptr;
             if (num_components == 1)
                 input_image = unorm8x1ArrayToImage(This->pData + offset,

diff --git a/lib/basis_encode.cpp b/lib/basis_encode.cpp
@@ -389,9 +389,6 @@ static bool basisuEncoderInitialized = false;
  * @exception KTX_INVALID_OPERATION
  *                              The texture image format's component size is not 8-bits.
  * @exception KTX_INVALID_OPERATION
- *                              @c separateRGToRGB_A is specified but the texture
- *                              has only 1 component.
- * @exception KTX_INVALID_OPERATION
  *                              Both preSwizzle and and inputSwizzle are specified
  *                              in @a params.
  * @exception KTX_OUT_OF_MEMORY Not enough memory to carry out compression.
@@ -426,9 +423,6 @@ ktxTexture2_CompressBasisEx(ktxTexture2* This, ktxBasisParams* params)
     if (component_size != 1)
         return KTX_INVALID_OPERATION; // Basis must have 8-bit components.
 
-    if (params->separateRGToRGB_A && num_components == 1)
-        return KTX_INVALID_OPERATION;
-
     if (This->pData == NULL) {
         result = ktxTexture2_LoadImageData(This, NULL, 0);
         if (result != KTX_SUCCESS)

diff --git a/tests/srcimages/Iron_Bars/Iron_Bars_001_normal_unnormalized.png b/tests/srcimages/Iron_Bars/Iron_Bars_001_normal_unnormalized.png
diff --git a/tests/testimages/astc_ldr_10x5_FlightHelmet_baseColor.ktx2 b/tests/testimages/astc_ldr_10x5_FlightHelmet_baseColor.ktx2
diff --git a/tests/testimages/astc_ldr_12x10_FlightHelmet_baseColor.ktx2 b/tests/testimages/astc_ldr_12x10_FlightHelmet_baseColor.ktx2
diff --git a/tests/testimages/astc_ldr_12x12_FlightHelmet_baseColor.ktx2 b/tests/testimages/astc_ldr_12x12_FlightHelmet_baseColor.ktx2
diff --git a/tests/testimages/astc_ldr_4x4_FlightHelmet_baseColor.ktx2 b/tests/testimages/astc_ldr_4x4_FlightHelmet_baseColor.ktx2
diff --git a/tests/testimages/astc_ldr_5x4_Iron_Bars_001_normal.ktx2 b/tests/testimages/astc_ldr_5x4_Iron_Bars_001_normal.ktx2
diff --git a/tests/testimages/astc_ldr_6x5_FlightHelmet_baseColor.ktx2 b/tests/testimages/astc_ldr_6x5_FlightHelmet_baseColor.ktx2
diff --git a/tests/testimages/astc_ldr_6x6_3dtex_7.ktx2 b/tests/testimages/astc_ldr_6x6_3dtex_7.ktx2
diff --git a/tests/testimages/astc_ldr_6x6_Iron_Bars_001_normal.ktx2 b/tests/testimages/astc_ldr_6x6_Iron_Bars_001_normal.ktx2
diff --git a/tests/testimages/astc_ldr_6x6_arraytex_7.ktx2 b/tests/testimages/astc_ldr_6x6_arraytex_7.ktx2
diff --git a/tests/testimages/astc_ldr_6x6_arraytex_7_mipmap.ktx2 b/tests/testimages/astc_ldr_6x6_arraytex_7_mipmap.ktx2
diff --git a/tests/testimages/astc_ldr_6x6_posx.ktx2 b/tests/testimages/astc_ldr_6x6_posx.ktx2
diff --git a/tests/testimages/astc_ldr_8x6_FlightHelmet_baseColor.ktx2 b/tests/testimages/astc_ldr_8x6_FlightHelmet_baseColor.ktx2
diff --git a/tests/testimages/astc_ldr_8x8_FlightHelmet_baseColor.ktx2 b/tests/testimages/astc_ldr_8x8_FlightHelmet_baseColor.ktx2
diff --git a/tests/testimages/astc_ldr_cubemap_6x6.ktx2 b/tests/testimages/astc_ldr_cubemap_6x6.ktx2
diff --git a/tests/testimages/astc_mipmap_ldr_10x5_posx.ktx2 b/tests/testimages/astc_mipmap_ldr_10x5_posx.ktx2
diff --git a/tests/testimages/astc_mipmap_ldr_12x10_posx.ktx2 b/tests/testimages/astc_mipmap_ldr_12x10_posx.ktx2
diff --git a/tests/testimages/astc_mipmap_ldr_12x12_posx.ktx2 b/tests/testimages/astc_mipmap_ldr_12x12_posx.ktx2
diff --git a/tests/testimages/astc_mipmap_ldr_4x4_posx.ktx2 b/tests/testimages/astc_mipmap_ldr_4x4_posx.ktx2
diff --git a/tests/testimages/astc_mipmap_ldr_6x5_posx.ktx2 b/tests/testimages/astc_mipmap_ldr_6x5_posx.ktx2
diff --git a/tests/testimages/astc_mipmap_ldr_6x6_kodim17_fast.ktx2 b/tests/testimages/astc_mipmap_ldr_6x6_kodim17_fast.ktx2
diff --git a/tests/testimages/astc_mipmap_ldr_6x6_kodim17_fastest.ktx2 b/tests/testimages/astc_mipmap_ldr_6x6_kodim17_fastest.ktx2
diff --git a/tests/testimages/astc_mipmap_ldr_6x6_kodim17_medium.ktx2 b/tests/testimages/astc_mipmap_ldr_6x6_kodim17_medium.ktx2
diff --git a/tests/testimages/astc_mipmap_ldr_6x6_posx.ktx2 b/tests/testimages/astc_mipmap_ldr_6x6_posx.ktx2
diff --git a/tests/testimages/astc_mipmap_ldr_6x6_posy.ktx2 b/tests/testimages/astc_mipmap_ldr_6x6_posy.ktx2
diff --git a/tests/testimages/astc_mipmap_ldr_6x6_posz.ktx2 b/tests/testimages/astc_mipmap_ldr_6x6_posz.ktx2
diff --git a/tests/testimages/astc_mipmap_ldr_8x6_posx.ktx2 b/tests/testimages/astc_mipmap_ldr_8x6_posx.ktx2
diff --git a/tests/testimages/astc_mipmap_ldr_8x8_posx.ktx2 b/tests/testimages/astc_mipmap_ldr_8x8_posx.ktx2
diff --git a/tests/testimages/astc_mipmap_ldr_cubemap_6x6.ktx2 b/tests/testimages/astc_mipmap_ldr_cubemap_6x6.ktx2
diff --git a/tests/testimages/etc1s_Iron_Bars_001_normal.ktx2 b/tests/testimages/etc1s_Iron_Bars_001_normal.ktx2
diff --git a/tests/testimages/genref b/tests/testimages/genref
@@ -90,6 +90,9 @@ $toktx --nowarn --t2 --test --input_swizzle 0rr1 --target_type RGBA cyan_rgba_re
 $toktx --nowarn --t2 --test --input_swizzle 0rr1 --target_type RGBA --bcmp cyan_rgb_reference_basis.ktx2 ../srcimages/level0.ppm
 $toktx --nowarn --t2 --test --input_swizzle 0rr1 --target_type RGBA --uastc -- cyan_rgb_reference_uastc.ktx2 ../srcimages/level0.ppm
 
+$toktx --nowarn --t2 --test --assign_oetf linear --normalize --normal_mode --encode uastc uastc_Iron_Bars_001_normal.ktx2 ../srcimages/Iron_Bars/Iron_Bars_001_normal_unnormalized.png
+$toktx --nowarn --t2 --test --assign_oetf linear --normalize --normal_mode --encode etc1s etc1s_Iron_Bars_001_normal.ktx2 ../srcimages/Iron_Bars/Iron_Bars_001_normal_unnormalized.png
+
 # ... and additional files for the load tests.
 
 $toktx --lower_left_maps_to_s0t0 rgb-reference-metadata.ktx ../srcimages/rgb.ppm
@@ -122,6 +125,8 @@ $toktx --test --encode astc --astc_blk_d 10x5   astc_ldr_10x5_FlightHelmet_baseC
 $toktx --test --encode astc --astc_blk_d 8x8    astc_ldr_8x8_FlightHelmet_baseColor.ktx2   ../srcimages/FlightHelmet_baseColor.png
 $toktx --test --encode astc --astc_blk_d 12x10  astc_ldr_12x10_FlightHelmet_baseColor.ktx2 ../srcimages/FlightHelmet_baseColor.png
 $toktx --test --encode astc --astc_blk_d 12x12  astc_ldr_12x12_FlightHelmet_baseColor.ktx2 ../srcimages/FlightHelmet_baseColor.png
+$toktx --test --assign_oetf linear --normalize --normal_mode --encode astc --astc_blk_d 6x6  astc_ldr_6x6_Iron_Bars_001_normal.ktx2 ../srcimages/Iron_Bars/Iron_Bars_001_normal_unnormalized.png
+$toktx --test --assign_oetf linear --normalize --normal_mode --encode astc --astc_blk_d 5x4  astc_ldr_5x4_Iron_Bars_001_normal.ktx2 ../srcimages/Iron_Bars/Iron_Bars_001_normal_unnormalized.png
 
 $toktx --test --layers 7 --encode astc --astc_blk_d 6x6             astc_ldr_6x6_arraytex_7.ktx2        ../srcimages/red16.png ../srcimages/orange16.png ../srcimages/yellow16.png ../srcimages/green16.png ../srcimages/blue16.png ../srcimages/indigo16.png ../srcimages/violet16.png
 $toktx --test --layers 7 --encode astc --astc_blk_d 6x6 --genmipmap astc_ldr_6x6_arraytex_7_mipmap.ktx2 ../srcimages/red16.png ../srcimages/orange16.png ../srcimages/yellow16.png ../srcimages/green16.png ../srcimages/blue16.png ../srcimages/indigo16.png ../srcimages/violet16.png

diff --git a/tests/testimages/uastc_Iron_Bars_001_normal.ktx2 b/tests/testimages/uastc_Iron_Bars_001_normal.ktx2
diff --git a/tests/tests.cmake b/tests/tests.cmake
@@ -15,6 +15,7 @@ add_subdirectory(streamtests)
 
 add_executable( unittests
     unittests/unittests.cc
+    unittests/image_unittests.cc
     unittests/wthelper.h
 )
 
@@ -23,6 +24,7 @@ target_include_directories(
 PRIVATE
     $<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
     ${PROJECT_SOURCE_DIR}/lib
+    ${PROJECT_SOURCE_DIR}/tools
 )
 
 target_link_libraries(

diff --git a/tests/toktx-tests.cmake b/tests/toktx-tests.cmake
@@ -186,6 +186,8 @@ gencmpktx( swizzle_r_to_gb_convert_to_rgba_u cyan_rgba_reference_u.ktx2 ../srcim
 gencmpktx( swizzle_r_to_gb_convert_to_rgba_basis cyan_rgb_reference_basis.ktx2 ../srcimages/level0.ppm "--nowarn --t2 --test --input_swizzle 0rr1 --target_type RGBA --bcmp" "" "" )
 gencmpktx( swizzle_r_to_gb_convert_to_rgba_uastc cyan_rgb_reference_uastc.ktx2 ../srcimages/level0.ppm "--nowarn --t2 --test --input_swizzle 0rr1 --target_type RGBA --uastc --" "" "" )
 
+gencmpktx( uastc_Iron_Bars_001_normal      uastc_Iron_Bars_001_normal.ktx2     ../srcimages/Iron_Bars/Iron_Bars_001_normal_unnormalized.png "--test --assign_oetf linear --normalize --normal_mode --encode uastc" "" "")
+gencmpktx( etc1s_Iron_Bars_001_normal      etc1s_Iron_Bars_001_normal.ktx2     ../srcimages/Iron_Bars/Iron_Bars_001_normal_unnormalized.png "--test --assign_oetf linear --normalize --normal_mode --encode etc1s" "" "")
 
 gencmpktx( gAMA_chunk_png g03n2c08.ktx2 ../srcimages/g03n2c08.png "--test --t2" "" "" )
 gencmpktx( cHRM_chunk_png ccwn2c08.ktx2 ../srcimages/ccwn2c08.png "--test --t2" "" "" )
@@ -238,6 +240,8 @@ gencmpktx( astc_ldr_10x5_FlightHelmet_baseColor   astc_ldr_10x5_FlightHelmet_bas
 gencmpktx( astc_ldr_8x8_FlightHelmet_baseColor    astc_ldr_8x8_FlightHelmet_baseColor.ktx2   ../srcimages/FlightHelmet_baseColor.png "--test --encode astc --astc_blk_d 8x8" "" "")
 gencmpktx( astc_ldr_12x10_FlightHelmet_baseColor  astc_ldr_12x10_FlightHelmet_baseColor.ktx2 ../srcimages/FlightHelmet_baseColor.png "--test --encode astc --astc_blk_d 12x10" "" "")
 gencmpktx( astc_ldr_12x12_FlightHelmet_baseColor  astc_ldr_12x12_FlightHelmet_baseColor.ktx2 ../srcimages/FlightHelmet_baseColor.png "--test --encode astc --astc_blk_d 12x12" "" "")
+gencmpktx( astc_ldr_6x6_Iron_Bars_001_normal      astc_ldr_6x6_Iron_Bars_001_normal.ktx2     ../srcimages/Iron_Bars/Iron_Bars_001_normal_unnormalized.png "--test --assign_oetf linear --normalize --normal_mode --encode astc --astc_blk_d 6x6" "" "")
+gencmpktx( astc_ldr_5x4_Iron_Bars_001_normal      astc_ldr_5x4_Iron_Bars_001_normal.ktx2     ../srcimages/Iron_Bars/Iron_Bars_001_normal_unnormalized.png "--test --assign_oetf linear --normalize --normal_mode --encode astc --astc_blk_d 5x4" "" "")
 
 gencmpktx( astc_ldr_6x6_arraytex_7 astc_ldr_6x6_arraytex_7.ktx2 "../srcimages/red16.png ../srcimages/orange16.png ../srcimages/yellow16.png ../srcimages/green16.png ../srcimages/blue16.png ../srcimages/indigo16.png ../srcimages/violet16.png" "--test --layers 7 --encode astc --astc_blk_d 6x6" "" "")
 gencmpktx( astc_ldr_6x6_arraytex_7_mipmap astc_ldr_6x6_arraytex_7_mipmap.ktx2 "../srcimages/red16.png ../srcimages/orange16.png ../srcimages/yellow16.png ../srcimages/green16.png ../srcimages/blue16.png ../srcimages/indigo16.png ../srcimages/violet16.png" "--test --layers 7 --encode astc --astc_blk_d 6x6 --genmipmap" "" "")