Merge pull request #105856 from akien-mga/basis_universal-rediff-patches

basis_universal: Rediff patches, remove Windows encoding fix

thirdparty/README.md

@@ -89,8 +89,7 @@ Patches:
 - `0002-external-jpgd.patch` (GH-88508)
 - `0003-external-tinyexr.patch` (GH-97582)
 - `0004-remove-tinydds-qoi.patch` (GH-97582)
-- `0005-windows-illegal-character.patch` (GH-103968)
-- `0006-ambiguous-calls.patch` (GH-103968)
+- `0005-ambiguous-calls.patch` (GH-103968)
 
 
 ## brotli

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^2), 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²), 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/patches/0002-external-jpgd.patch

@@ -1,8 +1,8 @@
 diff --git a/thirdparty/basis_universal/encoder/basisu_enc.cpp b/thirdparty/basis_universal/encoder/basisu_enc.cpp
-index b9804090b1..5987685ae7 100644
+index 1f870c5de4..1cc982b134 100644
 --- a/thirdparty/basis_universal/encoder/basisu_enc.cpp
 +++ b/thirdparty/basis_universal/encoder/basisu_enc.cpp
-@@ -492,7 +492,7 @@ namespace basisu
+@@ -504,7 +504,7 @@ namespace basisu
  	bool load_jpg(const char *pFilename, image& img)
  	{
  		int width = 0, height = 0, actual_comps = 0;
@@ -11,7 +11,7 @@ index b9804090b1..5987685ae7 100644
  		if (!pImage_data)
  			return false;
  		
-@@ -512,7 +512,7 @@ namespace basisu
+@@ -524,7 +524,7 @@ namespace basisu
  		}
  
  		int width = 0, height = 0, actual_comps = 0;

thirdparty/basis_universal/patches/0003-external-tinyexr.patch

@@ -1,5 +1,5 @@
 diff --git a/thirdparty/basis_universal/encoder/basisu_enc.cpp b/thirdparty/basis_universal/encoder/basisu_enc.cpp
-index 7904aab91c..4d885cba16 100644
+index 1cc982b134..ab9a458744 100644
 --- a/thirdparty/basis_universal/encoder/basisu_enc.cpp
 +++ b/thirdparty/basis_universal/encoder/basisu_enc.cpp
 @@ -29,7 +29,7 @@

thirdparty/basis_universal/patches/0005-windows-illegal-character.patch

@@ -1,13 +0,0 @@
-diff --git a/thirdparty/basis_universal/encoder/basisu_astc_hdr_6x6_enc.h b/thirdparty/basis_universal/encoder/basisu_astc_hdr_6x6_enc.h
-index 0d6d2ae936..8b82ad8c29 100644
---- a/thirdparty/basis_universal/encoder/basisu_astc_hdr_6x6_enc.h
-+++ b/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.