git subrepo pull (merge) lib/astc-encoder

lib/astc-encoder/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/ARM-software/astc-encoder.git
 	branch = main
-	commit = e7cb1e453968b0e16e48ef6d68fc9d1227d8a378
-	parent = b87158d371723ba9670f5dc13e50a3e2a2799eba
+	commit = 42a8f6ee01715f45edffb6773e34b8bb914a47df
+	parent = 2b1c072a13e9b69ada8457665b51ed5b59ddb408
 	method = merge
 	cmdver = 0.4.3

lib/astc-encoder/CMakeLists.txt

@@ -24,7 +24,7 @@ if(MSVC)
     add_compile_options("/wd4324") # Disable structure was padded due to alignment specifier
 endif()
 
-project(astcencoder VERSION 3.2.0)
+project(astcencoder VERSION 3.3.0)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -215,7 +215,7 @@ if(PACKAGE)
 
     set(PKG_VER ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR})
 
-    set(CPACK_PACKAGE_FILE_NAME "astcenc-${PKG_VER}-${PKG_OS}${PACKAGE}")
+    set(CPACK_PACKAGE_FILE_NAME "astcenc-${PKG_VER}-${PKG_OS}-${PACKAGE}")
     set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY FALSE)
     set(CPACK_PACKAGE_CHECKSUM SHA256)
     set(CPACK_GENERATOR ZIP)

lib/astc-encoder/Docs/Building.md

@@ -25,19 +25,22 @@ cd build
 # Configure your build of choice, for example:
 
 # x86-64 using NMake
-cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.\ ^
-    -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON ..
+cmake -G "NMake Makefiles" -T ClangCL -DCMAKE_BUILD_TYPE=Release ^
+    -DCMAKE_INSTALL_PREFIX=.\ -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON ..
 
 # x86-64 using Visual Studio solution
-cmake -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.\ ^
+cmake -G "Visual Studio 16 2019" -T ClangCL -DCMAKE_INSTALL_PREFIX=.\ ^
     -DISA_AVX2=ON -DISA_SSE41=ON -DISA_SSE2=ON ..
-
 ```
 
 This example shows all SIMD variants being enabled. It is possible to build a
 subset of the supported variants by enabling only the ones you require. At
 least one variant must be enabled.
 
+Using the Visual Studio Clang-cl LLVM toolchain (`-T ClangCL`) is optional but
+produces signficantly faster binaries than the default toolchain. The C++ LLVM
+toolchain component must be installed via the Visual Studio installer.
+
 ### Building
 
 Once you have configured the build you can use NMake to compile the project

lib/astc-encoder/Docs/ChangeLog-2x.md

@@ -226,7 +226,7 @@ speed. Our test sets show an average of 12% improvement in the codec for
 Key for performance charts:
 
 * Color = block size (see legend).
-* Letter = image format (N = normal map, G = greyscale, L = LDR, H = HDR).
+* Letter = image format (N = normal map, G = grayscale, L = LDR, H = HDR).
 
 **Absolute performance vs 2.1 release:**
 
@@ -283,7 +283,7 @@ recompile your client-side code using the updated `astcenc.h` header.
 Key for performance charts:
 
 * Color = block size (see legend).
-* Letter = image format (N = normal map, G = greyscale, L = LDR, H = HDR).
+* Letter = image format (N = normal map, G = grayscale, L = LDR, H = HDR).
 
 **Absolute performance vs 2.0 release:**
 
@@ -313,7 +313,7 @@ major changes over the earlier 1.7 series, and is not command-line compatible.
 Key for performance charts
 
 * Color = block size (see legend).
-* Letter = image format (N = normal map, G = greyscale, L = LDR, H = HDR).
+* Letter = image format (N = normal map, G = grayscale, L = LDR, H = HDR).
 
 **Absolute performance vs 1.7 release:**
 

lib/astc-encoder/Docs/ChangeLog-3x.md

@@ -4,19 +4,86 @@ This page summarizes the major functional and performance changes in each
 release of the 3.x series.
 
 All performance data on this page is measured on an Intel Core i5-9600K
-clocked at 4.2 GHz, running astcenc using AVX2 and 6 threads.
+clocked at 4.2 GHz, running `astcenc` using AVX2 and 6 threads.
+
+
+<!-- ---------------------------------------------------------------------- -->
+## 3.4
+
+**Status:** In development
+
+The 3.4 release introduces another round of optimizations, removing a number
+of power-user configuration options to simplify the core compressor data path.
+
+* **General:**
+  * **Feature:** The `-v` and `-va` options to set a per-texel error weight
+    function are no longer supported.
+  * **Feature:** The `-b` option to set a per-texel error weight boost for
+    block border texels is no longer supported.
+  * **Feature:** The `-a` option to set a per-texel error weight based on texel
+    alpha value is no longer supported as an error weighting tool, but is still
+    supported for providing sprite-sheet RDO.
+  * **Feature:** The `-mask` option to set an error metric for mask map
+    textures is still supported, but is currently a no-op in the compressor.
+  * **Feature:** The `-perceptual` option to set a perceptual error metric is
+    still supported, but is currently a no-op in the compressor for mask map
+    and normal map textures.
+
+### Performance:
+
+Key for charts:
+
+* Color = block size (see legend).
+* Letter = image format (N = normal map, G = grayscale, L = LDR, H = HDR).
+
+**Relative performance vs 3.3 release:**
+
+Pending ...
+
+<!-- ---------------------------------------------------------------------- -->
+## 3.3
+
+**Status:** November 2021
+
+The 3.3 release improves image quality for normal maps, and two component
+textures. Normal maps are expected to compress 25% slower than the 3.2
+release, although it should be noted that they are still faster to compress
+in 3.3 than when using the 2.5 series. This release also fixes one reported
+stability issue.
+
+* **General:**
+  * **Feature:** Normal map image quality has been improved.
+  * **Feature:** Two component image quality has been improved, provided
+    that unused components are correctly zero-weighted using e.g. `-cw` on the
+    command line.
+  * **Bug-fix:** Improved stability when trying to compress complex blocks that
+    could not beat even the starting quality threshold. These will now always
+    compress in to a constant color blocks.
+
+<!-- ---------------------------------------------------------------------- -->
+## 3.2
+
+**Status:** August 2021
+
+The 3.2 release is a bugfix release; no significant image quality or
+performance differences are expected.
+
+* **General:**
+  * **Bug-fix:** Improved stability when new contexts were created while other
+    contexts were compressing or decompressing an image.
+  * **Bug-fix:** Improved stability when decompressing blocks with invalid
+    block encodings.
 
 <!-- ---------------------------------------------------------------------- -->
 ## 3.1
 
 **Status:** July 2021
 
-The 3.1 release is the second release in the 3.x series. This release gives
-another performance boost, typically between 5 and 20% faster than the 3.0
-release, as well as further incremental improvements to image quality. A number
-of build system improvements make astcenc easier and faster to integrate into
-other projects as a library, including support for building universal binaries
-on macOS. Full change list is shown below.
+The 3.1 release gives another performance boost, typically between 5 and 20%
+faster than the 3.0 release, as well as further incremental improvements to
+image quality. A number of build system improvements make astcenc easier and
+faster to integrate into other projects as a library, including support for
+building universal binaries on macOS. Full change list is shown below.
 
 Reminder for users of the library interface - the API is not designed to be
 binary compatible across versions, and this release is not compatible with
@@ -59,7 +126,7 @@ updated `astcenc.h` header.
 Key for charts:
 
 * Color = block size (see legend).
-* Letter = image format (N = normal map, G = greyscale, L = LDR, H = HDR).
+* Letter = image format (N = normal map, G = grayscale, L = LDR, H = HDR).
 
 **Relative performance vs 3.0 release:**
 
@@ -110,7 +177,7 @@ updated `astcenc.h` header.
 Key for charts:
 
 * Color = block size (see legend).
-* Letter = image format (N = normal map, G = greyscale, L = LDR, H = HDR).
+* Letter = image format (N = normal map, G = grayscale, L = LDR, H = HDR).
 
 **Absolute performance vs 2.5 release:**
 

lib/astc-encoder/Docs/Encoding.md

@@ -1,8 +1,8 @@
 # Effective ASTC Encoding
 
 Most texture compression schemes encode a single color format at single
-bitrate, so there are relatively few configuration options available to
-content creators beyond selecting which compressed format to use.
+bitrate, so there are relatively few configuration options available to content
+creators beyond selecting which compressed format to use.
 
 ASTC on the other hand is an extremely flexible container format which can
 compress multiple color formats at multiple bit rates. Inevitably this
@@ -169,12 +169,7 @@ vector rather than for absolute color error in the data, which improves the
 perceptual quality of the image.
 
 Both the encoding swizzle and the angular error function are enabled by using
-the `-normal` command line option. Normal map compression additionally supports
-a dedicated perceptual error mode, enabled with the `-perceptual` switch, which
-also optimizes for variance in the normal vector over a small neighborhood.
-This can improve perceived visual quality by reducing variability that is
-amplified by specular lighting calculations, but it will reduce the apparent
-PSNR of the image.
+the `-normal` command line option.
 
 ## Encoding sRGB data
 

lib/astc-encoder/Docs/FileFormat.md

@@ -64,4 +64,4 @@ Binary payload
 
 The binary payload is a byte stream that immediately follows the header. It
 contains 16 bytes per compressed block. The number of compressed blocks is
-determined programmatically based on the header information.
+determined from the header information.