git subrepo pull (merge) lib/astc-encoder (KhronosGroup#537)

* git subrepo pull (merge) lib/astc-encoder

subrepo:
  subdir:   "lib/astc-encoder"
  merged:   "adc637b0"
upstream:
  origin:   "https://github.com/ARM-software/astc-encoder.git"
  branch:   "main"
  commit:   "42a8f6ee"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Update gold images

Co-authored-by: Wasim Abbas <abbas.wasim@gmail.com>

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/README.md

@@ -58,16 +58,12 @@ from 0.89 bits/pixel up to 8 bits/pixel.
 Release build binaries for the `astcenc` stable releases are provided in the
 [GitHub Releases page][3].
 
-**Latest 3.x stable release:** 3.2
+**Latest 3.x stable release:** 3.3
 * Change log: [3.x series](./Docs/ChangeLog-3x.md)
 
 **Latest 2.x stable release:** 2.5
 * Change log: [2.x series](./Docs/ChangeLog-2x.md)
 
-**Latest development release:** 3.3-develop
-* Change log: [3.x series](./Docs/ChangeLog-3x.md)
-* Roadmap: [Ideas ...](./Docs/Roadmap.md)
-
 Binaries are provided for 64-bit builds on Windows, macOS, and Linux. The
 builds of the astcenc are provided as multiple binaries, each tuned for a
 specific SIMD instruction set.

lib/astc-encoder/Source/astcenc.h

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // ----------------------------------------------------------------------------
-// Copyright 2020-2021 Arm Limited
+// Copyright 2020-2022 Arm Limited
 //
 // Licensed under the Apache License, Version 2.0 (the "License"); you may not
 // use this file except in compliance with the License. You may obtain a copy
@@ -405,36 +405,6 @@ struct astcenc_config
 	/** @brief The ASTC block size Z dimension. */
 	unsigned int block_z;
 
-	/** @brief The size of the texel kernel for error weighting (-v). */
-	unsigned int v_rgba_radius;
-
-	/** @brief The mean and stdev component mix for error weighting (-v). */
-	float v_rgba_mean_stdev_mix;
-
-	/** @brief The texel RGB power for error weighting (-v). */
-	float v_rgb_power;
-
-	/** @brief The texel RGB base weight for error weighting (-v). */
-	float v_rgb_base;
-
-	/** @brief The texel RGB mean weight for error weighting (-v). */
-	float v_rgb_mean;
-
-	/** @brief The texel RGB stdev for error weighting (-v). */
-	float v_rgb_stdev;
-
-	/** @brief The texel A power for error weighting (-va). */
-	float v_a_power;
-
-	/** @brief The texel A base weight for error weighting (-va). */
-	float v_a_base;
-
-	/** @brief The texel A mean weight for error weighting (-va). */
-	float v_a_mean;
-
-	/** @brief The texel A stdev for error weighting (-va). */
-	float v_a_stdev;
-
 	/** @brief The red component weight scale for error weighting (-cw). */
 	float cw_r_weight;
 
@@ -456,13 +426,6 @@ struct astcenc_config
 	 */
 	unsigned int a_scale_radius;
 
-	/**
-	 * @brief The additional weight for block edge texels (-b).
-	 *
-	 * This is generic tool for reducing artefacts visible on block changes.
-	 */
-	float b_deblock_weight;
-
 	/** @brief The RGBM scale factor for the shared multiplier (-rgbm). */
 	float rgbm_m_scale;