Use less pointers in AstcDecoder

ds5678 · ds5678 · commit b4863dcae77b · 2023-09-05T23:22:01.000-04:00
diff --git a/AssetRipper.TextureDecoder/Astc/AstcDecoder.cs b/AssetRipper.TextureDecoder/Astc/AstcDecoder.cs
@@ -34,7 +34,7 @@ private unsafe static int DecodeASTC(byte* input, int width, int height, int blo
 			int bcw = (width + blockWidth - 1) / blockWidth;
 			int bch = (height + blockHeight - 1) / blockHeight;
 			int clen_last = (width + blockWidth - 1) % blockWidth + 1;
-			uint* buf = stackalloc uint[blockWidth * blockHeight];
+			Span<uint> buf = stackalloc uint[blockWidth * blockHeight];
 			int inputOffset = 0;
 			for (int t = 0; t < bch; t++)
 			{
@@ -43,23 +43,21 @@ private unsafe static int DecodeASTC(byte* input, int width, int height, int blo
 					DecodeBlock(input + inputOffset, blockWidth, blockHeight, buf);
 					int clen = s < bcw - 1 ? blockWidth : clen_last;
 					uint* outputPtr = (uint*)(output + (t * blockHeight * 4 * width + s * 4 * blockWidth));
-					uint* bufPtr = buf;
 					for (int i = 0, y = t * blockHeight; i < blockHeight && y < height; i++, y++)
 					{
 						for (int j = 0; j < clen; j++)
 						{
-							outputPtr[j] = bufPtr[j];
+							outputPtr[j] = buf[j + i * blockWidth];
 						}
 
 						outputPtr += width;
-						bufPtr += blockWidth;
 					}
 				}
 			}
 			return inputOffset;
 		}
 
-		private unsafe static void DecodeBlock(byte* input, int blockWidth, int blockHeight, uint* output)
+		private unsafe static void DecodeBlock(byte* input, int blockWidth, int blockHeight, Span<uint> output)
 		{
 			if (input[0] == 0xfc && (input[1] & 1) == 1)
 			{
@@ -82,7 +80,7 @@ private unsafe static void DecodeBlock(byte* input, int blockWidth, int blockHei
 				{
 					SelectPartition(input, blockPtr);
 				}
-				ApplicateColor(blockPtr, output);
+				ApplicateColor(blockData, output);
 			}
 		}
 
@@ -680,56 +678,56 @@ private unsafe static void SelectPartition(byte* input, BlockData* block)
 			}
 		}
 
-		private unsafe static void ApplicateColor(BlockData* block, uint* output)
+		private unsafe static void ApplicateColor(BlockData block, Span<uint> output)
 		{
-			if (block->dual_plane != 0)
+			if (block.dual_plane != 0)
 			{
-				int* ps = stackalloc int[] { 0, 0, 0, 0 };
-				ps[block->plane_selector] = 1;
-				if (block->part_num > 1)
+				Span<int> ps = stackalloc int[] { 0, 0, 0, 0 };
+				ps[block.plane_selector] = 1;
+				if (block.part_num > 1)
 				{
-					for (int i = 0; i < block->bw * block->bh; i++)
+					for (int i = 0; i < block.bw * block.bh; i++)
 					{
-						int p = block->partition[i];
-						byte r = SelectColor(block->endpoints[p * 8 + 0], block->endpoints[p * 8 + 4], block->weights[i * 2 + ps[0]]);
-						byte g = SelectColor(block->endpoints[p * 8 + 1], block->endpoints[p * 8 + 5], block->weights[i * 2 + ps[1]]);
-						byte b = SelectColor(block->endpoints[p * 8 + 2], block->endpoints[p * 8 + 6], block->weights[i * 2 + ps[2]]);
-						byte a = SelectColor(block->endpoints[p * 8 + 3], block->endpoints[p * 8 + 7], block->weights[i * 2 + ps[3]]);
+						int p = block.partition[i];
+						byte r = SelectColor(block.endpoints[p * 8 + 0], block.endpoints[p * 8 + 4], block.weights[i * 2 + ps[0]]);
+						byte g = SelectColor(block.endpoints[p * 8 + 1], block.endpoints[p * 8 + 5], block.weights[i * 2 + ps[1]]);
+						byte b = SelectColor(block.endpoints[p * 8 + 2], block.endpoints[p * 8 + 6], block.weights[i * 2 + ps[2]]);
+						byte a = SelectColor(block.endpoints[p * 8 + 3], block.endpoints[p * 8 + 7], block.weights[i * 2 + ps[3]]);
 						output[i] = Color(r, g, b, a);
 					}
 				}
 				else
 				{
-					for (int i = 0; i < block->bw * block->bh; i++)
+					for (int i = 0; i < block.bw * block.bh; i++)
 					{
-						byte r = SelectColor(block->endpoints[0], block->endpoints[4], block->weights[i * 2 + ps[0]]);
-						byte g = SelectColor(block->endpoints[1], block->endpoints[5], block->weights[i * 2 + ps[1]]);
-						byte b = SelectColor(block->endpoints[2], block->endpoints[6], block->weights[i * 2 + ps[2]]);
-						byte a = SelectColor(block->endpoints[3], block->endpoints[7], block->weights[i * 2 + ps[3]]);
+						byte r = SelectColor(block.endpoints[0], block.endpoints[4], block.weights[i * 2 + ps[0]]);
+						byte g = SelectColor(block.endpoints[1], block.endpoints[5], block.weights[i * 2 + ps[1]]);
+						byte b = SelectColor(block.endpoints[2], block.endpoints[6], block.weights[i * 2 + ps[2]]);
+						byte a = SelectColor(block.endpoints[3], block.endpoints[7], block.weights[i * 2 + ps[3]]);
 						output[i] = Color(r, g, b, a);
 					}
 				}
 			}
-			else if (block->part_num > 1)
+			else if (block.part_num > 1)
 			{
-				for (int i = 0; i < block->bw * block->bh; i++)
+				for (int i = 0; i < block.bw * block.bh; i++)
 				{
-					int p = block->partition[i];
-					byte r = SelectColor(block->endpoints[p * 8 + 0], block->endpoints[p * 8 + 4], block->weights[i * 2]);
-					byte g = SelectColor(block->endpoints[p * 8 + 1], block->endpoints[p * 8 + 5], block->weights[i * 2]);
-					byte b = SelectColor(block->endpoints[p * 8 + 2], block->endpoints[p * 8 + 6], block->weights[i * 2]);
-					byte a = SelectColor(block->endpoints[p * 8 + 3], block->endpoints[p * 8 + 7], block->weights[i * 2]);
+					int p = block.partition[i];
+					byte r = SelectColor(block.endpoints[p * 8 + 0], block.endpoints[p * 8 + 4], block.weights[i * 2]);
+					byte g = SelectColor(block.endpoints[p * 8 + 1], block.endpoints[p * 8 + 5], block.weights[i * 2]);
+					byte b = SelectColor(block.endpoints[p * 8 + 2], block.endpoints[p * 8 + 6], block.weights[i * 2]);
+					byte a = SelectColor(block.endpoints[p * 8 + 3], block.endpoints[p * 8 + 7], block.weights[i * 2]);
 					output[i] = Color(r, g, b, a);
 				}
 			}
 			else
 			{
-				for (int i = 0; i < block->bw * block->bh; i++)
+				for (int i = 0; i < block.bw * block.bh; i++)
 				{
-					byte r = SelectColor(block->endpoints[0], block->endpoints[4], block->weights[i * 2]);
-					byte g = SelectColor(block->endpoints[1], block->endpoints[5], block->weights[i * 2]);
-					byte b = SelectColor(block->endpoints[2], block->endpoints[6], block->weights[i * 2]);
-					byte a = SelectColor(block->endpoints[3], block->endpoints[7], block->weights[i * 2]);
+					byte r = SelectColor(block.endpoints[0], block.endpoints[4], block.weights[i * 2]);
+					byte g = SelectColor(block.endpoints[1], block.endpoints[5], block.weights[i * 2]);
+					byte b = SelectColor(block.endpoints[2], block.endpoints[6], block.weights[i * 2]);
+					byte a = SelectColor(block.endpoints[3], block.endpoints[7], block.weights[i * 2]);
 					output[i] = Color(r, g, b, a);
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ private unsafe static int DecodeASTC(byte* input, int width, int height, int blo`
`34`	`34`	`int bcw = (width + blockWidth - 1) / blockWidth;`
`35`	`35`	`int bch = (height + blockHeight - 1) / blockHeight;`
`36`	`36`	`int clen_last = (width + blockWidth - 1) % blockWidth + 1;`
`37`		`- uint* buf = stackalloc uint[blockWidth * blockHeight];`
	`37`	`+ Span<uint> buf = stackalloc uint[blockWidth * blockHeight];`
`38`	`38`	`int inputOffset = 0;`
`39`	`39`	`for (int t = 0; t < bch; t++)`
`40`	`40`	`{`
`@@ -43,23 +43,21 @@ private unsafe static int DecodeASTC(byte* input, int width, int height, int blo`
`43`	`43`	`DecodeBlock(input + inputOffset, blockWidth, blockHeight, buf);`
`44`	`44`	`int clen = s < bcw - 1 ? blockWidth : clen_last;`
`45`	`45`	`uint* outputPtr = (uint)(output + (t blockHeight * 4 * width + s * 4 * blockWidth));`
`46`		`- uint* bufPtr = buf;`
`47`	`46`	`for (int i = 0, y = t * blockHeight; i < blockHeight && y < height; i++, y++)`
`48`	`47`	`{`
`49`	`48`	`for (int j = 0; j < clen; j++)`
`50`	`49`	`{`
`51`		`- outputPtr[j] = bufPtr[j];`
	`50`	`+ outputPtr[j] = buf[j + i * blockWidth];`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`outputPtr += width;`
`55`		`- bufPtr += blockWidth;`
`56`	`54`	`}`
`57`	`55`	`}`
`58`	`56`	`}`
`59`	`57`	`return inputOffset;`
`60`	`58`	`}`
`61`	`59`
`62`		`- private unsafe static void DecodeBlock(byte* input, int blockWidth, int blockHeight, uint* output)`
	`60`	`+ private unsafe static void DecodeBlock(byte* input, int blockWidth, int blockHeight, Span<uint> output)`
`63`	`61`	`{`
`64`	`62`	`if (input[0] == 0xfc && (input[1] & 1) == 1)`
`65`	`63`	`{`
`@@ -82,7 +80,7 @@ private unsafe static void DecodeBlock(byte* input, int blockWidth, int blockHei`
`82`	`80`	`{`
`83`	`81`	`SelectPartition(input, blockPtr);`
`84`	`82`	`}`
`85`		`- ApplicateColor(blockPtr, output);`
	`83`	`+ ApplicateColor(blockData, output);`
`86`	`84`	`}`
`87`	`85`	`}`
`88`	`86`
`@@ -680,56 +678,56 @@ private unsafe static void SelectPartition(byte* input, BlockData* block)`
`680`	`678`	`}`
`681`	`679`	`}`
`682`	`680`
`683`		`- private unsafe static void ApplicateColor(BlockData* block, uint* output)`
	`681`	`+ private unsafe static void ApplicateColor(BlockData block, Span<uint> output)`
`684`	`682`	`{`
`685`		`- if (block->dual_plane != 0)`
	`683`	`+ if (block.dual_plane != 0)`
`686`	`684`	`{`
`687`		`- int* ps = stackalloc int[] { 0, 0, 0, 0 };`
`688`		`- ps[block->plane_selector] = 1;`
`689`		`- if (block->part_num > 1)`
	`685`	`+ Span<int> ps = stackalloc int[] { 0, 0, 0, 0 };`
	`686`	`+ ps[block.plane_selector] = 1;`
	`687`	`+ if (block.part_num > 1)`
`690`	`688`	`{`
`691`		`- for (int i = 0; i < block->bw * block->bh; i++)`
	`689`	`+ for (int i = 0; i < block.bw * block.bh; i++)`
`692`	`690`	`{`
`693`		`- int p = block->partition[i];`
`694`		`- byte r = SelectColor(block->endpoints[p * 8 + 0], block->endpoints[p * 8 + 4], block->weights[i * 2 + ps[0]]);`
`695`		`- byte g = SelectColor(block->endpoints[p * 8 + 1], block->endpoints[p * 8 + 5], block->weights[i * 2 + ps[1]]);`
`696`		`- byte b = SelectColor(block->endpoints[p * 8 + 2], block->endpoints[p * 8 + 6], block->weights[i * 2 + ps[2]]);`
`697`		`- byte a = SelectColor(block->endpoints[p * 8 + 3], block->endpoints[p * 8 + 7], block->weights[i * 2 + ps[3]]);`
	`691`	`+ int p = block.partition[i];`
	`692`	`+ byte r = SelectColor(block.endpoints[p * 8 + 0], block.endpoints[p * 8 + 4], block.weights[i * 2 + ps[0]]);`
	`693`	`+ byte g = SelectColor(block.endpoints[p * 8 + 1], block.endpoints[p * 8 + 5], block.weights[i * 2 + ps[1]]);`
	`694`	`+ byte b = SelectColor(block.endpoints[p * 8 + 2], block.endpoints[p * 8 + 6], block.weights[i * 2 + ps[2]]);`
	`695`	`+ byte a = SelectColor(block.endpoints[p * 8 + 3], block.endpoints[p * 8 + 7], block.weights[i * 2 + ps[3]]);`
`698`	`696`	`output[i] = Color(r, g, b, a);`
`699`	`697`	`}`
`700`	`698`	`}`
`701`	`699`	`else`
`702`	`700`	`{`
`703`		`- for (int i = 0; i < block->bw * block->bh; i++)`
	`701`	`+ for (int i = 0; i < block.bw * block.bh; i++)`
`704`	`702`	`{`
`705`		`- byte r = SelectColor(block->endpoints[0], block->endpoints[4], block->weights[i * 2 + ps[0]]);`
`706`		`- byte g = SelectColor(block->endpoints[1], block->endpoints[5], block->weights[i * 2 + ps[1]]);`
`707`		`- byte b = SelectColor(block->endpoints[2], block->endpoints[6], block->weights[i * 2 + ps[2]]);`
`708`		`- byte a = SelectColor(block->endpoints[3], block->endpoints[7], block->weights[i * 2 + ps[3]]);`
	`703`	`+ byte r = SelectColor(block.endpoints[0], block.endpoints[4], block.weights[i * 2 + ps[0]]);`
	`704`	`+ byte g = SelectColor(block.endpoints[1], block.endpoints[5], block.weights[i * 2 + ps[1]]);`
	`705`	`+ byte b = SelectColor(block.endpoints[2], block.endpoints[6], block.weights[i * 2 + ps[2]]);`
	`706`	`+ byte a = SelectColor(block.endpoints[3], block.endpoints[7], block.weights[i * 2 + ps[3]]);`
`709`	`707`	`output[i] = Color(r, g, b, a);`
`710`	`708`	`}`
`711`	`709`	`}`
`712`	`710`	`}`
`713`		`- else if (block->part_num > 1)`
	`711`	`+ else if (block.part_num > 1)`
`714`	`712`	`{`
`715`		`- for (int i = 0; i < block->bw * block->bh; i++)`
	`713`	`+ for (int i = 0; i < block.bw * block.bh; i++)`
`716`	`714`	`{`
`717`		`- int p = block->partition[i];`
`718`		`- byte r = SelectColor(block->endpoints[p * 8 + 0], block->endpoints[p * 8 + 4], block->weights[i * 2]);`
`719`		`- byte g = SelectColor(block->endpoints[p * 8 + 1], block->endpoints[p * 8 + 5], block->weights[i * 2]);`
`720`		`- byte b = SelectColor(block->endpoints[p * 8 + 2], block->endpoints[p * 8 + 6], block->weights[i * 2]);`
`721`		`- byte a = SelectColor(block->endpoints[p * 8 + 3], block->endpoints[p * 8 + 7], block->weights[i * 2]);`
	`715`	`+ int p = block.partition[i];`
	`716`	`+ byte r = SelectColor(block.endpoints[p * 8 + 0], block.endpoints[p * 8 + 4], block.weights[i * 2]);`
	`717`	`+ byte g = SelectColor(block.endpoints[p * 8 + 1], block.endpoints[p * 8 + 5], block.weights[i * 2]);`
	`718`	`+ byte b = SelectColor(block.endpoints[p * 8 + 2], block.endpoints[p * 8 + 6], block.weights[i * 2]);`
	`719`	`+ byte a = SelectColor(block.endpoints[p * 8 + 3], block.endpoints[p * 8 + 7], block.weights[i * 2]);`
`722`	`720`	`output[i] = Color(r, g, b, a);`
`723`	`721`	`}`
`724`	`722`	`}`
`725`	`723`	`else`
`726`	`724`	`{`
`727`		`- for (int i = 0; i < block->bw * block->bh; i++)`
	`725`	`+ for (int i = 0; i < block.bw * block.bh; i++)`
`728`	`726`	`{`
`729`		`- byte r = SelectColor(block->endpoints[0], block->endpoints[4], block->weights[i * 2]);`
`730`		`- byte g = SelectColor(block->endpoints[1], block->endpoints[5], block->weights[i * 2]);`
`731`		`- byte b = SelectColor(block->endpoints[2], block->endpoints[6], block->weights[i * 2]);`
`732`		`- byte a = SelectColor(block->endpoints[3], block->endpoints[7], block->weights[i * 2]);`
	`727`	`+ byte r = SelectColor(block.endpoints[0], block.endpoints[4], block.weights[i * 2]);`
	`728`	`+ byte g = SelectColor(block.endpoints[1], block.endpoints[5], block.weights[i * 2]);`
	`729`	`+ byte b = SelectColor(block.endpoints[2], block.endpoints[6], block.weights[i * 2]);`
	`730`	`+ byte a = SelectColor(block.endpoints[3], block.endpoints[7], block.weights[i * 2]);`
`733`	`731`	`output[i] = Color(r, g, b, a);`
`734`	`732`	`}`
`735`	`733`	`}`