Export ktxTexture2_DecodeAstc in JS bindings (#1034)

Add ktxTexture2_DecodeAstc to `libktx_read`, a previous omission. Needed
too so the function can be included in the read-only JS bindings.

Add tests of ASTC encode and decode functionality to `texturetest`. The
change includes needing to pass the path to `ktxdiff` to `texturetests`
as the new tests use it to compare the decoded result with the original
image.

Change `texturetest` to use std::filesystem::path and c++17.

Fix issue in `astc_codec.cpp` where conversion of `params.inputSwizzle'
could fail, asserting in a debug build.

Author: MarkCallow

.github/workflows/mingw.yml

@@ -76,7 +76,7 @@ jobs:
       run: cmake --build build --config Release
     - name: Test Mingw build
       run: ctest --output-on-failure --test-dir build -C Release
-    - name: Upload test log
-      shell: pwsh
-      if: ${{ failure() }}
-      run: scripts/on_failure.ps1
+#    - name: Upload test log
+#      shell: pwsh
+#      if: ${{ failure() }}
+#      run: scripts/on_failure.ps1

CMakeLists.txt

@@ -372,6 +372,7 @@ set(KTX_BUILD_DIR "${CMAKE_BINARY_DIR}")
 set(KTX_MAIN_SRC
     include/KHR/khr_df.h
     include/ktx.h
+    lib/astc_codec.cpp
     lib/basis_sgd.h
     lib/basis_transcode.cpp
     lib/miniz_wrapper.cpp
@@ -763,7 +764,6 @@ macro(common_libktx_settings target enable_write library_type)
             ${target}
         PRIVATE
             lib/basis_encode.cpp
-            lib/astc_codec.cpp
             ${BASISU_ENCODER_CXX_SRC}
             lib/writer1.c
             lib/writer2.c
@@ -1267,21 +1267,25 @@ PRIVATE
     $<$<AND:${is_clangcl},$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,17.0.3>>:_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR>
 )
 
-if(NOT BUILD_SHARED_LIBS AND APPLE)
-    # Make a single static library to simplify linking.
-    add_dependencies(ktx ${ASTCENC_LIB_TARGET})
-    add_custom_command( TARGET ktx
-        POST_BUILD
-        COMMAND libtool -static -o $<TARGET_FILE:ktx> $<TARGET_FILE:ktx> $<TARGET_FILE:${ASTCENC_LIB_TARGET}>
-    )
+macro(set_astc_dependencies target)
+    if(NOT BUILD_SHARED_LIBS AND APPLE)
+        # Make a single static library to simplify linking.
+        add_dependencies(${target} ${ASTCENC_LIB_TARGET})
+        add_custom_command( TARGET ${target}
+            POST_BUILD
+            COMMAND libtool -static -o $<TARGET_FILE:${target}> $<TARGET_FILE:ktx> $<TARGET_FILE:${ASTCENC_LIB_TARGET}>
+        )
 
-    # Don't know libtool equivalent on Windows or Emscripten. Applications
-    # will have to link with  both ktx and ${ASTCENC_LIB_TARGET}. Static libs
-    # are unlikely to be used on Windows so not a problem there. For Emscripten
-    # everything is built into the JS module so not an issue there either.
-else()
-    target_link_libraries(ktx PRIVATE ${ASTCENC_LIB_TARGET})
-endif()
+        # Don't know libtool equivalent on Windows or Emscripten. Applications
+        # will have to link with  both ktx and ${ASTCENC_LIB_TARGET}. Static libs
+        # are unlikely to be used on Windows so not a problem there. For Emscripten
+        # everything is built into the JS module so not an issue there either.
+    else()
+        target_link_libraries(${target} PRIVATE ${ASTCENC_LIB_TARGET})
+    endif()
+endmacro(set_astc_dependencies)
+set_astc_dependencies(ktx)
+set_astc_dependencies(ktx_read)
 
 # Other external projects
 # `NOT TARGET`s here are a precaution. They would only be exercised if

interface/js_binding/ktx_wrapper.cpp

@@ -101,7 +101,7 @@ namespace ktx
         }
 
         // This is needed because embind cannot do constructor overloads
-        // where the only the parameter type(s) differ. See
+        // where only the parameter type(s) differ. See
         // class_<ktx::texture> in EMSCRIPTEN_BINDINGS below for more
         // details.
         texture createCopy()
@@ -256,6 +256,16 @@ namespace ktx
             return result;
         }
 
+        ktx_error_code_e decodeAstc()
+        {
+            ktx_error_code_e result;
+            result = ktxTexture2_DecodeAstc(*this);
+            if (result != KTX_SUCCESS) {
+                std::cout << "ERROR: Failed to decodeAstc: " << ktxErrorString(result) << std::endl;
+            }
+            return result;
+        }
+
         // NOTE: WebGLTexture objects are completely opaque so the option of passing in the texture
         // to use is not viable.
         val glUpload()
@@ -363,7 +373,7 @@ namespace ktx
 
             result = ktxTexture2_CompressAstcEx(*this, &params);
             if (result != KTX_SUCCESS) {
-                std::cout << "ERROR: failed to compressAstc: " << ktxErrorString(result) << std::endl;
+                std::cout << "ERROR: Failed to compressAstc: " << ktxErrorString(result) << std::endl;
             }
             return result;
         }
@@ -426,7 +436,7 @@ namespace ktx
 
             result = ktxTexture2_DeflateZstd(*this, compression_level);
             if (result != KTX_SUCCESS) {
-                std::cout << "ERROR: failed to deflateZstd: " << ktxErrorString(result) << std::endl;
+                std::cout << "ERROR: Failed to deflateZstd: " << ktxErrorString(result) << std::endl;
             }
             return result;
         }
@@ -443,7 +453,7 @@ namespace ktx
 
             result = ktxTexture2_DeflateZLIB(*this, compression_level);
             if (result != KTX_SUCCESS) {
-                std::cout << "ERROR: failed to deflateZLIB: " << ktxErrorString(result) << std::endl;
+                std::cout << "ERROR: Failed to deflateZLIB: " << ktxErrorString(result) << std::endl;
             }
             return result;
         }
@@ -457,7 +467,7 @@ namespace ktx
                                            value.c_str());
 
             if (result != KTX_SUCCESS) {
-                std::cout << "ERROR: failed to addKVPair (string): " << ktxErrorString(result) << std::endl;
+                std::cout << "ERROR: Failed to addKVPair (string): " << ktxErrorString(result) << std::endl;
             }
             return result;
         }
@@ -479,7 +489,7 @@ namespace ktx
                                            value.data());
 
             if (result != KTX_SUCCESS) {
-                std::cout << "ERROR: failed to addKVPair (vector): " << ktxErrorString(result) << std::endl;
+                std::cout << "ERROR: Failed to addKVPair (vector): " << ktxErrorString(result) << std::endl;
             }
             return result;
         }
@@ -491,7 +501,7 @@ namespace ktx
             result = ktxHashList_DeleteKVPair(ht, key.c_str());
 
             if (result != KTX_SUCCESS) {
-                std::cout << "ERROR: failed to deleteKVPair: " << ktxErrorString(result) << std::endl;
+                std::cout << "ERROR: Failed to deleteKVPair: " << ktxErrorString(result) << std::endl;
             }
             return result;
         }
@@ -526,11 +536,11 @@ namespace ktx
             if (result == KTX_SUCCESS) {
                 return val(emscripten::typed_memory_view(ktx_data_size, ktx_data));
             } else {
-                std::cout << "ERROR: failed to writeToMemory: " << ktxErrorString(result) << std::endl;
+                std::cout << "ERROR: Failed to writeToMemory: " << ktxErrorString(result) << std::endl;
                 return val::null();
             }
         }
-#endif
+#endif /* KTX_FEATURE_WRITE */
     };
 }
 
@@ -633,6 +643,7 @@ interface texture {
                 CreateStorageEnum? storage);
 
     error_code compressAstc(ktxAstcParams params); // **
+    error_code decodeAstc(ktxAstcParams params);
     error_code compressBasis(ktxBasisParams params); // **
     texture createCopy();  // **
     error_code defateZLIB();   // **
@@ -1286,6 +1297,7 @@ EMSCRIPTEN_BINDINGS(ktx)
         .function("findKeyValue", &ktx::texture::findKeyValue)
         .function("getImage", &ktx::texture::getImage)
         .function("glUpload", &ktx::texture::glUpload)
+        .function("decodeAstc", &ktx::texture::decodeAstc)
         .function("transcodeBasis", &ktx::texture::transcodeBasis)
 #if KTX_FEATURE_WRITE
         .constructor<const ktxTextureCreateInfo&, ktxTextureCreateStorageEnum>()