Incremented version to 2.7.5.

akb825 · Mar 11, 2024 · bd9fec8 · bd9fec8
1 parent ddeb0c8
commit bd9fec8
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 15 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -41,7 +41,7 @@ jobs:
           artifact: 1
     steps:
     - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Download submodules
       run: |-
         git submodule update --init
@@ -143,7 +143,7 @@ jobs:
           artifact: 1
     steps:
     - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Download submodules
       run: |-
         git submodule update --init
@@ -257,7 +257,7 @@ jobs:
           artifact: win64
     steps:
     - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Download submodules
       run: |-
         git submodule update --init

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -69,7 +69,7 @@ endif()
 
 set(CUTTLEFISH_MAJOR_VERSION 2)
 set(CUTTLEFISH_MINOR_VERSION 7)
-set(CUTTLEFISH_PATCH_VERSION 4)
+set(CUTTLEFISH_PATCH_VERSION 5)
 set(CUTTLEFISH_VERSION ${CUTTLEFISH_MAJOR_VERSION}.${CUTTLEFISH_MINOR_VERSION}.${CUTTLEFISH_PATCH_VERSION})
 
 set(CUTTLEFISH_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/cmake/FindPVRTexLib.cmake b/cmake/FindPVRTexLib.cmake
@@ -29,17 +29,10 @@ find_path(
 )
 
 IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  IF (${CUTTLEFISH_ARCH} STREQUAL "x86_64")
-    find_library(PVRTEXLIB_LIB PVRTexLib
-      PATHS ${PVRTEXLIB_ROOT}/OSX_x86
-      NO_DEFAULT_PATH
-    )
-  ELSE()
     find_library(PVRTEXLIB_LIB PVRTexLib
       PATHS ${PVRTEXLIB_ROOT}/macOS
       NO_DEFAULT_PATH
     )
-  ENDIF()
 
   SET( USE_PTHREAD TRUE )
 

diff --git a/lib/ISPCTextureCompressor b/lib/ISPCTextureCompressor
diff --git a/lib/PVRTexToolLib b/lib/PVRTexToolLib
diff --git a/lib/astc-encoder b/lib/astc-encoder
diff --git a/lib/compressonator b/lib/compressonator
+ −		Linux_armv7/PVRTexLibPy.cpython-39-arm-linux-gnueabi.so
+ −		Linux_armv7/libPVRTexLib.so
+ −		Linux_armv7hf/PVRTexLibPy.cpython-39-arm-linux-gnueabihf.so
+ −		Linux_armv7hf/libPVRTexLib.so
+ −		Linux_armv8_64/PVRTexLibPy.cpython-39-aarch64-linux-gnu.so
+ −		Linux_armv8_64/libPVRTexLib.so
+ −		Linux_riscv64/PVRTexLibPy.cpython-39-riscv64-linux-gnu.so
+ −		Linux_riscv64/libPVRTexLib.so
+ −		Linux_x86_32/PVRTexLibPy.cpython-39-i386-linux-gnu.so
+ −		Linux_x86_32/libPVRTexLib.so
+ −		Linux_x86_64/PVRTexLibPy.cpython-39-x86_64-linux-gnu.so
+ −		Linux_x86_64/libPVRTexLib.so
+ −		OSX_x86/PVRTexLibPy.cpython-37m-darwin.so
+ −		OSX_x86/libPVRTexLib.dylib
+0 −64		OSX_x86/setup.py
+ −		Windows_x86_32/PVRTexLib.dll
+ −		Windows_x86_32/PVRTexLib.lib
+ −		Windows_x86_64/PVRTexLib.dll
+ −		Windows_x86_64/PVRTexLib.lib
+ −		Windows_x86_64/PVRTexLibPy.cp39-win_amd64.pyd
+ −		macOS/PVRTexLibPy.cpython-310-darwin.so
+ −		macOS/PVRTexLibPy.cpython-38-darwin.so
+ −		macOS/libPVRTexLib.dylib
+2 −2		CMakeLists.txt
+87 −1		Docs/ChangeLog-4x.md
+24 −1		Docs/Encoding.md
+11 −6		README.md
+2 −2		Source/Fuzzers/fuzz_astc_physical_to_symbolic.cpp
+13 −1		Source/UnitTest/cmake_core.cmake
+79 −0		Source/UnitTest/test_decode.cpp
+30 −30		Source/UnitTest/test_simd.cpp
+40 −1		Source/astcenc.h
+40 −17		Source/astcenc_color_unquantize.cpp
+8 −7		Source/astcenc_compress_symbolic.cpp
+54 −46		Source/astcenc_decompress_symbolic.cpp
+65 −44		Source/astcenc_entry.cpp
+35 −22		Source/astcenc_find_best_partitioning.cpp
+11 −11		Source/astcenc_ideal_endpoints_and_weights.cpp
+3 −3		Source/astcenc_image.cpp
+69 −47		Source/astcenc_internal.h
+64 −7		Source/astcenc_internal_entry.h
+14 −2		Source/astcenc_mathlib.h
+41 −39		Source/astcenc_symbolic_physical.cpp
+14 −6		Source/astcenc_vecmathlib_avx2_8.h
+4 −4		Source/astcenc_vecmathlib_common_4.h
+40 −13		Source/astcenc_vecmathlib_neon_4.h
+56 −20		Source/astcenc_vecmathlib_none_4.h
+53 −21		Source/astcenc_vecmathlib_sse_4.h
+10 −10		Source/astcenc_weight_align.cpp
+5 −4		Source/astcenccli_image_load_store.cpp
+6 −4		Source/astcenccli_internal.h
+102 −14		Source/astcenccli_platform_dependents.cpp
+94 −11		Source/astcenccli_toplevel.cpp
+13 −1		Source/astcenccli_toplevel_help.cpp
+26 −0		Test/Images/HDRIHaven/astc_reference-4.5-avx2_fast_results.csv
+26 −0		Test/Images/HDRIHaven/astc_reference-4.5-avx2_fastest_results.csv
+26 −0		Test/Images/HDRIHaven/astc_reference-4.5-avx2_medium_results.csv
+26 −0		Test/Images/HDRIHaven/astc_reference-4.5-avx2_thorough_results.csv
+51 −0		Test/Images/Khronos/astc_reference-4.5-avx2_fast_results.csv
+51 −0		Test/Images/Khronos/astc_reference-4.5-avx2_fastest_results.csv
+51 −0		Test/Images/Khronos/astc_reference-4.5-avx2_medium_results.csv
+51 −0		Test/Images/Khronos/astc_reference-4.5-avx2_thorough_results.csv
+121 −0		Test/Images/Kodak/astc_reference-4.5-avx2_fast_results.csv
+121 −0		Test/Images/Kodak/astc_reference-4.5-avx2_fastest_results.csv
+121 −0		Test/Images/Kodak/astc_reference-4.5-avx2_medium_results.csv
+121 −0		Test/Images/Kodak/astc_reference-4.5-avx2_thorough_results.csv
+6 −0		Test/Images/KodakMnt/astc_reference-4.5-avx2_fast_results.csv
+6 −0		Test/Images/KodakMnt/astc_reference-4.5-avx2_fastest_results.csv
+6 −0		Test/Images/KodakMnt/astc_reference-4.5-avx2_medium_results.csv
+6 −0		Test/Images/KodakMnt/astc_reference-4.5-avx2_thorough_results.csv
+21 −0		Test/Images/KodakSim/astc_reference-4.5-avx2_fast_results.csv
+21 −0		Test/Images/KodakSim/astc_reference-4.5-avx2_fastest_results.csv
+21 −0		Test/Images/KodakSim/astc_reference-4.5-avx2_medium_results.csv
+21 −0		Test/Images/KodakSim/astc_reference-4.5-avx2_thorough_results.csv
+150 −0		Test/Images/Small/astc_reference-4.5-avx2_fast_results.csv
+150 −0		Test/Images/Small/astc_reference-4.5-avx2_fastest_results.csv
+150 −0		Test/Images/Small/astc_reference-4.5-avx2_medium_results.csv
+150 −0		Test/Images/Small/astc_reference-4.5-avx2_thorough_results.csv
+149 −149		Test/Images/Small/astc_reference-main-avx2_fast_results.csv
+149 −149		Test/Images/Small/astc_reference-main-avx2_fastest_results.csv
+149 −149		Test/Images/Small/astc_reference-main-avx2_medium_results.csv
+149 −149		Test/Images/Small/astc_reference-main-avx2_thorough_results.csv
+1 −1		Test/astc_profile_valgrind.py
+2 −1		Test/astc_test_functional.py
+2 −9		Test/astc_test_image.py
+117 −0		Utils/astcenc_u8_test_bench.cpp
+4 −3		jenkins/build-image.sh
+37 −7		jenkins/nightly.Jenkinsfile
+47 −28		jenkins/release.Jenkinsfile