Merge pull request #111445 from akien-mga/basisu-git-2025-10-09

basis_universal: Sync with latest Git to solve more warnings

Author: Repiteo

COPYRIGHT.txt

@@ -214,7 +214,7 @@ License: Apache-2.0
 
 Files: thirdparty/basis_universal/*
 Comment: Basis Universal
-Copyright: 2019-2024, Binomial LLC.
+Copyright: 2019-2025, Binomial LLC.
 License: Apache-2.0
 
 Files: thirdparty/brotli/*

thirdparty/README.md

@@ -74,7 +74,7 @@ Files extracted from upstream source:
 ## basis_universal
 
 - Upstream: https://github.com/BinomialLLC/basis_universal
-- Version: 1.60 (323239a6a5ffa57d6570cfc403be99156e33a8b0, 2025)
+- Version: git (b1110111d4a93c7dd7de93ce3d9ed8fcdfd114f2, 2025)
 - License: Apache 2.0
 
 Files extracted from upstream source:
@@ -88,9 +88,9 @@ Patches:
 - `0001-external-zstd-pr344.patch` (GH-73441)
 - `0002-external-tinyexr.patch` (GH-97582)
 - `0003-remove-tinydds-qoi.patch` (GH-97582)
-- `0004-ambiguous-calls.patch` (GH-103968)
-- `0005-msvc-include-ctype.patch` (GH-106155)
-- `0006-clang-warning-exclude.patch` (GH-111346)
+- `0004-clang-warning-exclude.patch` (GH-111346)
+- `0005-unused-typedef.patch` (GH-111445)
+
 
 ## brotli
 

thirdparty/basis_universal/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2019-2025 Binomial LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

thirdparty/basis_universal/encoder/3rdparty/android_astc_decomp.cpp

@@ -837,7 +837,7 @@ void decodeISETritBlock (ISEDecodedResult* dst, int numValues, BitAccessStream&
     deUint32 T7     = data.getNext(1);
 
 #ifndef __EMSCRIPTEN__
-#if defined(__GNUC__) && !defined(__clang__)
+#ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough="            
 #endif  
@@ -854,7 +854,7 @@ void decodeISETritBlock (ISEDecodedResult* dst, int numValues, BitAccessStream&
             DE_ASSERT(false);
     }
 #ifndef __EMSCRIPTEN__
-#if defined(__GNUC__) && !defined(__clang__)
+#ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif 
 #endif
@@ -903,7 +903,7 @@ void decodeISEQuintBlock (ISEDecodedResult* dst, int numValues, BitAccessStream&
     deUint32 Q56    = data.getNext(2);
 
 #ifndef __EMSCRIPTEN__
-#if defined(__GNUC__) && !defined(__clang__)
+#ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough="            
 #endif  
@@ -918,7 +918,7 @@ void decodeISEQuintBlock (ISEDecodedResult* dst, int numValues, BitAccessStream&
             DE_ASSERT(false);
     }
 #ifndef __EMSCRIPTEN__
-#if defined(__GNUC__) && !defined(__clang__)
+#ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif 
 #endif

thirdparty/basis_universal/encoder/basisu_astc_hdr_6x6_enc.cpp

@@ -2376,7 +2376,7 @@ static void filter_block(uint32_t grid_x, uint32_t grid_y, const vec3F* pSrc_blo
 	// filter columns
 	if (grid_y == 6)
 	{
-		memcpy(pDst_block, temp_block, sizeof(vec3F) * 6 * 6);
+		memcpy((void *)pDst_block, temp_block, sizeof(vec3F) * 6 * 6);
 	}
 	else
 	{
@@ -3360,6 +3360,7 @@ static bool pack_bc6h_image(const imagef &src_img, vector2D<basist::bc6h_block>
 
 	interval_timer tm;
 	double total_enc_time = 0.0f;
+	BASISU_NOTE_UNUSED(total_enc_time);
 
 	const uint32_t num_blocks_x = src_img.get_block_width(4);
 	const uint32_t num_blocks_y = src_img.get_block_height(4);
@@ -4422,7 +4423,18 @@ static bool compress_strip_task(
 				float min_corr = BIG_FLOAT_VAL, max_corr = -BIG_FLOAT_VAL;
 				for (uint32_t i = 0; i < 3; i++)
 				{
-					if (half_comp_stats[i].m_range > 0.0f)
+#if 0
+					// 9/5/2025, wrong metric, we're iterating channels pairs here, not individual channels. 
+					// On 3 active channel blocks this causes no difference.
+					if (half_comp_stats[i].m_range > 0.0f) 
+#else
+					static const uint8_t s_chan_pairs[3][2] = { {0, 1}, {0, 2}, {1, 2} };
+					
+					const uint32_t chanA = s_chan_pairs[i][0];
+					const uint32_t chanB = s_chan_pairs[i][1];
+					
+					if ((half_comp_stats[chanA].m_range > 0.0f) && (half_comp_stats[chanB].m_range > 0.0f))
+#endif
 					{
 						const float c = fabsf((float)half_cross_chan_stats[i].m_pearson);
 						min_corr = minimum(min_corr, c);
@@ -4437,7 +4449,7 @@ static bool compress_strip_task(
 					// TODO: Transform grayscale axis by covar matrix, compute variance vs. total variance
 					const float MODE7_MIN_CHAN_CORR = .5f;
 					const float MODE7_PCA_ANGLE_THRESH = .9f;
-					use_single_subset_mode7 = is_grayscale || is_solid_block || (min_corr >= MODE7_MIN_CHAN_CORR);
+					use_single_subset_mode7 = is_grayscale || is_solid_block || ((total_used_block_chans == 1) || (min_corr >= MODE7_MIN_CHAN_CORR));
 
 					if (use_single_subset_mode7)
 					{

thirdparty/basis_universal/encoder/basisu_astc_hdr_6x6_enc.h

@@ -16,7 +16,7 @@ namespace astc_6x6_hdr
 	{
 		// Important: The Delta ITP colorspace error metric we use internally makes several assumptions about the nature of the HDR RGB inputs supplied to the encoder.
 		// This encoder computes colorspace error in the ICtCp (or more accurately the delta ITP, where CT is scaled by .5 vs. ICtCp to become T) colorspace, so getting this correct is important.
-		// By default the encoder assumes the input is in absolute luminance (in nits or candela per square meter, cd/m²), specified as positive-only linear light RGB, using the REC 709 colorspace gamut (but NOT the sRGB transfer function, i.e. linear light).
+		// By default the encoder assumes the input is in absolute luminance (in nits or candela per square meter, cd/m^2), specified as positive-only linear light RGB, using the REC 709 colorspace gamut (but NOT the sRGB transfer function, i.e. linear light).
 		// If the m_rec2020_bt2100_color_gamut flag is true, the input colorspace is treated as REC 2020/BT.2100 (which is wider than 709).
 		// For SDR/LDR->HDR upconversion, the REC 709 sRGB input should be converted to linear light (sRGB->linear) and the resulting normalized linear RGB values scaled by either 80 or 100 nits (the luminance of a typical SDR monitor). 
 		// SDR upconversion to normalized [0,1] (i.e. non-absolute) luminances may work but is not supported because ITP errors will not be predicted correctly.

thirdparty/basis_universal/encoder/basisu_comp.cpp

@@ -3448,15 +3448,15 @@ namespace basisu
 		}
 		default:
 			assert(0);
-			fmt_debug_printf("HERE 1\n");
+			//fmt_debug_printf("HERE 1\n");
 			return false;
 		}
 
 		if (can_use_zstd)
 		{
 			if ((m_params.m_ktx2_uastc_supercompression != basist::KTX2_SS_NONE) && (m_params.m_ktx2_uastc_supercompression != basist::KTX2_SS_ZSTANDARD))
 			{
-				fmt_debug_printf("HERE 2\n");
+				//fmt_debug_printf("HERE 2\n");
 				return false;
 			}
 		}
@@ -3492,7 +3492,7 @@ namespace basisu
 		}
 
 		basist::ktx2_header header;
-		memset(&header, 0, sizeof(header));
+		memset((void *)&header, 0, sizeof(header));
 
 		memcpy(header.m_identifier, basist::g_ktx2_file_identifier, sizeof(basist::g_ktx2_file_identifier));
 		header.m_pixel_width = base_width;
@@ -3544,7 +3544,7 @@ namespace basisu
 			}
 			default:
 				assert(0);
-				fmt_debug_printf("HERE 3\n");
+				//fmt_debug_printf("HERE 3\n");
 				return false;
 			}
 		}
@@ -3584,7 +3584,7 @@ namespace basisu
 
 				if (ZSTD_isError(result))
 				{
-					fmt_debug_printf("HERE 5\n");
+					//fmt_debug_printf("HERE 5\n");
 					return false;
 				}
 
@@ -3593,7 +3593,7 @@ namespace basisu
 #else
 			// Can't get here
 			assert(0);
-			fmt_debug_printf("HERE 6\n");
+			//fmt_debug_printf("HERE 6\n");
 			return false;
 #endif
 		}
@@ -3618,7 +3618,7 @@ namespace basisu
 			etc1s_global_data_header.m_tables_byte_length = backend_output.m_slice_image_tables.size();
 
 			basisu::vector<basist::ktx2_etc1s_image_desc> etc1s_image_descs(total_levels * total_layers * total_faces);
-			memset(etc1s_image_descs.data(), 0, etc1s_image_descs.size_in_bytes());
+			memset((void *)etc1s_image_descs.data(), 0, etc1s_image_descs.size_in_bytes());
 
 			for (uint32_t slice_index = 0; slice_index < m_slice_descs.size(); slice_index++)
 			{
@@ -3662,7 +3662,7 @@ namespace basisu
 		else if (m_fmt_mode == basist::basis_tex_format::cASTC_HDR_6x6_INTERMEDIATE)
 		{
 			basisu::vector<basist::ktx2_astc_hdr_6x6_intermediate_image_desc> image_descs(total_levels * total_layers * total_faces);
-			memset(image_descs.data(), 0, image_descs.size_in_bytes());
+			memset((void *)image_descs.data(), 0, image_descs.size_in_bytes());
 
 			for (uint32_t slice_index = 0; slice_index < m_slice_descs.size(); slice_index++)
 			{
@@ -3717,7 +3717,7 @@ namespace basisu
 		uint8_vec dfd;
 		if (!get_dfd(dfd, header))
 		{
-			fmt_debug_printf("HERE 7\n");
+			//fmt_debug_printf("HERE 7\n");
 			return false;
 		}
 
@@ -3729,20 +3729,20 @@ namespace basisu
 			{
 				if (key_values[i].m_key.size() < 2)
 				{
-					fmt_debug_printf("HERE 8\n");
+					//fmt_debug_printf("HERE 8\n");
 					return false;
 				}
 
 				if (key_values[i].m_key.back() != 0)
 				{
-					fmt_debug_printf("HERE 9\n");
+					//fmt_debug_printf("HERE 9\n");
 					return false;
 				}
 
 				const uint64_t total_len = (uint64_t)key_values[i].m_key.size() + (uint64_t)key_values[i].m_value.size();
 				if (total_len >= UINT32_MAX)
 				{
-					fmt_debug_printf("HERE 10\n");
+					//fmt_debug_printf("HERE 10\n");
 					return false;
 				}
 
@@ -3777,7 +3777,7 @@ namespace basisu
 			assert(!pass);
 			if (pass)
 			{
-				fmt_debug_printf("HERE 11\n");
+				//fmt_debug_printf("HERE 11\n");
 				return false;
 			}
 
@@ -3805,7 +3805,7 @@ namespace basisu
 		}
 
 		basisu::vector<basist::ktx2_level_index> level_index_array(total_levels);
-		memset(level_index_array.data(), 0, level_index_array.size_in_bytes());
+		memset((void *)level_index_array.data(), 0, level_index_array.size_in_bytes());
 
 		m_output_ktx2_file.clear();
 		m_output_ktx2_file.reserve(m_output_basis_file.size());

thirdparty/basis_universal/encoder/basisu_enc.cpp

@@ -651,7 +651,7 @@ namespace basisu
 			}
 
 			img.resize(width, height);
-			memcpy(img.get_ptr(), pMem, width * height * sizeof(float) * 4);
+			memcpy((void *)img.get_ptr(), pMem, width * height * sizeof(float) * 4);
 
 			break;
 		}
@@ -2236,7 +2236,10 @@ namespace basisu
 		debug_printf("job_pool::~job_pool\n");
 
 		// Notify all workers that they need to die right now.
-		m_kill_flag.store(true);
+		{
+			std::lock_guard<std::mutex> lk(m_mutex);
+			m_kill_flag.store(true);
+		}
 
 		m_has_work.notify_all();
 
@@ -2326,17 +2329,27 @@ namespace basisu
 
 		m_num_active_workers.fetch_add(1);
 
-		while (true)
+		while (!m_kill_flag)
 		{
 			std::unique_lock<std::mutex> lock(m_mutex);
 
 			// Wait for any jobs to be issued.
+#if 0
 			m_has_work.wait(lock, [this] { return m_kill_flag || m_queue.size(); } );
+#else
+			// For more safety vs. buggy RTL's. Worse case we stall for a second vs. locking up forever if something goes wrong.
+			m_has_work.wait_for(lock, std::chrono::milliseconds(1000), [this] {
+				return m_kill_flag || !m_queue.empty();
+				});
+#endif
 
 			// Check to see if we're supposed to exit.
 			if (m_kill_flag)
 				break;
 
+			if (m_queue.empty())
+				continue;
+
 			// Get the job and execute it.
 			std::function<void()> job(m_queue.back());
 			m_queue.pop_back();
@@ -3449,7 +3462,7 @@ namespace basisu
 		}
 		else
 		{
-			memcpy(img.get_ptr(), out_rgba, sizeof(float) * 4 * img.get_total_pixels());
+			memcpy((void *)img.get_ptr(), out_rgba, static_cast<size_t>(sizeof(float) * 4 * img.get_total_pixels()));
 		}
 
 		free(out_rgba);
@@ -3471,7 +3484,7 @@ namespace basisu
 		}
 
 		img.resize(width, height);
-		memcpy(img.get_ptr(), out_rgba, width * height * sizeof(float) * 4);
+		memcpy((void *)img.get_ptr(), out_rgba, width * height * sizeof(float) * 4);
 		free(out_rgba);
 
 		return true;

thirdparty/basis_universal/encoder/basisu_enc.h

@@ -22,6 +22,7 @@
 #include <functional>
 #include <thread>
 #include <unordered_map>
+#include <map>
 #include <ostream>
 
 #if !defined(_WIN32) || defined(__MINGW32__)
@@ -2163,17 +2164,24 @@ namespace basisu
 		uint32_t max_threads, job_pool *pJob_pool,
 		bool even_odd_input_pairs_equal)
 	{
+		// rg 6/24/2025 - Cross platform determinism
+#if 0
 		typedef bit_hasher<typename Quantizer::training_vec_type> training_vec_bit_hasher;
-		
 		typedef std::unordered_map < typename Quantizer::training_vec_type, weighted_block_group, 
 			training_vec_bit_hasher> group_hash;
+#else
+		typedef std::map< typename Quantizer::training_vec_type, weighted_block_group > group_hash;
+#endif
 
 		//interval_timer tm;
 		//tm.start();
 
 		group_hash unique_vecs;
 
+		// rg 6/24/2025 - Cross platform determinism
+#if 0
 		unique_vecs.reserve(20000);
+#endif
 
 		weighted_block_group g;
 

thirdparty/basis_universal/encoder/basisu_opencl.cpp

@@ -31,7 +31,9 @@
 #include <CL/cl.h>
 #endif
 
-#define BASISU_OPENCL_ASSERT_ON_ANY_ERRORS (1)
+#ifndef BASISU_OPENCL_ASSERT_ON_ANY_ERRORS
+	#define BASISU_OPENCL_ASSERT_ON_ANY_ERRORS (0)
+#endif
 
 namespace basisu
 {