Remove non-generic PVRTC methods

Author: ds5678

AssetRipper.TextureDecoder.ConsoleApp/Program.cs

@@ -241,7 +241,7 @@ private static void DecodePvrtc(ReadOnlySpan<byte> input, int width, int height,
 	{
 		Console.WriteLine("Arg at index 5 : 2bitMode");
 		bool do2bit = bool.Parse(do2bitModeString);
-		PvrtcDecoder.DecompressPVRTC(input, width, height, do2bit, output);
+		PvrtcDecoder.DecompressPVRTC<ColorBGRA32, byte>(input, width, height, do2bit, output);
 	}
 
 	public static void WriteAllBytes(string path, ReadOnlySpan<byte> bytes)

AssetRipper.TextureDecoder.Tests/PvrtcTests.cs

@@ -1,4 +1,5 @@
 using AssetRipper.TextureDecoder.Pvrtc;
+using AssetRipper.TextureDecoder.Rgb.Formats;
 
 namespace AssetRipper.TextureDecoder.Tests;
 
@@ -11,7 +12,7 @@ public void DecompressPVRTCTest()
 		int totalBytesRead = 0;
 		foreach (int size in new int[] { 512, 256, 128, 64, 32, 16, 8, 4, 2, 1 }) //mip maps
 		{
-			int bytesRead = PvrtcDecoder.DecompressPVRTC(data, size, size, false, out _);
+			int bytesRead = PvrtcDecoder.DecompressPVRTC<ColorBGRA32, byte>(data, size, size, false, out _);
 			totalBytesRead += bytesRead;
 		}
 		Assert.That(totalBytesRead, Is.EqualTo(data.Length));
@@ -32,7 +33,7 @@ public void DecompressPVRTCTest()
 	private static void AssertCorrectDecompression<T>(bool do2bitMode, double maxMeanDeviation, double maxStandardDeviation) where T : ITexture
 	{
 		ReadOnlySpan<byte> data = T.Data;
-		int bytesRead = PvrtcDecoder.DecompressPVRTC(data, T.Width, T.Height, do2bitMode, out byte[] decompressedData);
+		int bytesRead = PvrtcDecoder.DecompressPVRTC<ColorBGRA32, byte>(data, T.Width, T.Height, do2bitMode, out byte[] decompressedData);
 		if (!T.Mips)
 		{
 			Assert.That(bytesRead, Is.EqualTo(data.Length));

AssetRipper.TextureDecoder/Pvrtc/PvrtcDecoder.cs

@@ -2,41 +2,12 @@
 #define ASSUME_IMAGE_TILING
 
 using AssetRipper.TextureDecoder.Rgb;
-using AssetRipper.TextureDecoder.Rgb.Formats;
 using System.Diagnostics;
 
 namespace AssetRipper.TextureDecoder.Pvrtc
 {
 	public static partial class PvrtcDecoder
 	{
-		/// <summary>
-		/// Decompresses PVRTC to BGRA 8888
-		/// </summary>
-		/// <param name="input">The PVRTC texture data to decompress</param>
-		/// <param name="xDim">X dimension (width) of the texture</param>
-		/// <param name="yDim">Y dimension (height) of the texture</param>
-		/// <param name="output">The decompressed texture data</param>
-		/// <param name="do2bitMode">Signifies whether the data is PVRTC2 or PVRTC4</param>
-		/// <returns>The number of bytes read from <paramref name="input"/></returns>
-		public static int DecompressPVRTC(ReadOnlySpan<byte> input, int xDim, int yDim, bool do2bitMode, out byte[] output)
-		{
-			return DecompressPVRTC<ColorBGRA32, byte>(input, xDim, yDim, do2bitMode, out output);
-		}
-
-		/// <summary>
-		/// Decompresses PVRTC to BGRA 8888
-		/// </summary>
-		/// <param name="input">The PVRTC texture data to decompress</param>
-		/// <param name="xDim">X dimension (width) of the texture</param>
-		/// <param name="yDim">Y dimension (height) of the texture</param>
-		/// <param name="output">The decompressed texture data</param>
-		/// <param name="do2bitMode">Signifies whether the data is PVRTC2 or PVRTC4</param>
-		/// <returns>The number of bytes read from <paramref name="input"/></returns>
-		public static int DecompressPVRTC(ReadOnlySpan<byte> input, int xDim, int yDim, bool do2bitMode, Span<byte> output)
-		{
-			return DecompressPVRTC<ColorBGRA32, byte>(input, xDim, yDim, do2bitMode, output);
-		}
-
 		/// <summary>
 		/// Decompresses PVRTC
 		/// </summary>
@@ -91,6 +62,7 @@ public static int DecompressPVRTC<TOutputColor, TOutputChannelValue>(ReadOnlySpa
 			where TOutputColor : unmanaged, IColor<TOutputChannelValue>
 		{
 			ThrowHelper.ThrowIfNotLittleEndian();
+			ThrowHelper.ThrowIfNotEnoughSpace(output.Length, xDim * yDim);
 			int xBlockSize = do2bitMode ? BlockX2bpp : BlockX4bpp;
 			// for MBX don't allow the sizes to get too small
 			int blockXDim = Math.Max(2, xDim / xBlockSize);