Cleanup sym_to_phy and phy_to_sym

solidpixel · solidpixel · commit 6174fc8761bc · 2020-10-06T22:46:52.000+01:00
- Pass by reference for singular values (mostly so we
  can distinguish singletons and arrays in code reviews).
- Pass PCB by ref rather than relying on write elision.
- Add some missing statics for module local functions
diff --git a/Source/astcenc_compress_symbolic.cpp b/Source/astcenc_compress_symbolic.cpp
@@ -1204,6 +1204,9 @@ void compress_symbolic_block(
 			scb->constant_color[3] = astc::flt2int_rtn(alpha * 65535.0f);
 		}
 
+		physical_compressed_block pcb;
+		symbolic_to_physical(*bsd, *scb, pcb);
+		physical_to_symbolic(*bsd, pcb, *scb);
 		return;
 	}
 
@@ -1447,7 +1450,6 @@ void compress_symbolic_block(
 				}
 			}
 
-
 			// Modes 7, 10 (13 is unreachable)
 			best_errorvals_in_modes[3 * (partition_count - 2) + 5 + 2] = best_errorval_in_mode;
 
@@ -1460,8 +1462,9 @@ void compress_symbolic_block(
 
 END_OF_TESTS:
 	// compress/decompress to a physical block
-	physical_compressed_block psb = symbolic_to_physical(bsd, scb);
-	physical_to_symbolic(bsd, psb, scb);
+	physical_compressed_block pcb;
+	symbolic_to_physical(*bsd, *scb, pcb);
+	physical_to_symbolic(*bsd, pcb, *scb);
 }
 
 #endif
diff --git a/Source/astcenc_entry.cpp b/Source/astcenc_entry.cpp
@@ -598,12 +598,15 @@ static void compress_image(
 			int x = rem - (y * row_blocks);
 
 			// Decompress
-			int offset = ((z * yblocks + y) * xblocks + x) * 16;
-			const uint8_t *bp = buffer + offset;
 			fetch_imageblock(decode_mode, image, &pb, bsd, x * block_x, y * block_y, z * block_z, swizzle);
+
 			symbolic_compressed_block scb;
 			compress_symbolic_block(ctx, image, decode_mode, bsd, &pb, &scb, temp_buffers);
-			*(physical_compressed_block*) bp = symbolic_to_physical(bsd, &scb);
+
+			int offset = ((z * yblocks + y) * xblocks + x) * 16;
+			uint8_t *bp = buffer + offset;
+			physical_compressed_block* pcb = reinterpret_cast<physical_compressed_block*>(bp);
+			symbolic_to_physical(*bsd, scb, *pcb);
 		}
 
 		ctx.manage_compress.complete_task_assignment(count);
@@ -773,10 +776,13 @@ astcenc_error astcenc_decompress_image(
 				const uint8_t* bp = data + offset;
 				physical_compressed_block pcb = *(physical_compressed_block *) bp;
 				symbolic_compressed_block scb;
-				physical_to_symbolic(context->bsd, pcb, &scb);
+
+				physical_to_symbolic(*context->bsd, pcb, scb);
+
 				decompress_symbolic_block(context->config.profile, context->bsd,
 				                          x * block_x, y * block_y, z * block_z,
 				                          &scb, &pb);
+
 				write_imageblock(image_out, &pb, context->bsd,
 				                 x * block_x, y * block_y, z * block_z, swizzle);
 			}
diff --git a/Source/astcenc_image.cpp b/Source/astcenc_image.cpp
@@ -25,7 +25,7 @@
 #include "astcenc_internal.h"
 
 // conversion functions between the LNS representation and the FP16 representation.
-float float_to_lns(float p)
+static float float_to_lns(float p)
 {
 	if (astc::isnan(p) || p <= 1.0f / 67108864.0f)
 	{
@@ -66,7 +66,7 @@ float float_to_lns(float p)
 	return p1 + 1.0f;
 }
 
-uint16_t lns_to_sf16(uint16_t p)
+static uint16_t lns_to_sf16(uint16_t p)
 {
 	uint16_t mc = p & 0x7FF;
 	uint16_t ec = p >> 11;
diff --git a/Source/astcenc_integer_sequence.cpp b/Source/astcenc_integer_sequence.cpp
@@ -329,7 +329,7 @@ static const uint8_t integer_of_trits[3][3][3][3][3] = {
 	}
 };
 
-void find_number_of_bits_trits_quints(
+static void find_number_of_bits_trits_quints(
 	int quantization_level,
 	int* bits,
 	int* trits,
diff --git a/Source/astcenc_internal.h b/Source/astcenc_internal.h
@@ -1125,22 +1125,19 @@ void decompress_symbolic_block(
 	const symbolic_compressed_block* scb,
 	imageblock* blk);
 
-physical_compressed_block symbolic_to_physical(
-	const block_size_descriptor* bsd,
-	const symbolic_compressed_block* sc);
+void symbolic_to_physical(
+	const block_size_descriptor& bsd,
+	const symbolic_compressed_block& scb,
+	physical_compressed_block& pcb);
 
 void physical_to_symbolic(
-	const block_size_descriptor* bsd,
-	physical_compressed_block pb,
-	symbolic_compressed_block* res);
+	const block_size_descriptor& bsd,
+	const physical_compressed_block& pcb,
+	symbolic_compressed_block& scb);
 
 uint16_t unorm16_to_sf16(
 	uint16_t p);
 
-uint16_t lns_to_sf16(
-	uint16_t p);
-
-
 struct astcenc_context
 {
 	astcenc_config config;
diff --git a/Source/astcenc_symbolic_physical.cpp b/Source/astcenc_symbolic_physical.cpp
diff --git a/Source/astcenc_weight_align.cpp b/Source/astcenc_weight_align.cpp

Original file line number	Diff line number	Diff line change
`@@ -1204,6 +1204,9 @@ void compress_symbolic_block(`
`1204`	`1204`	`scb->constant_color[3] = astc::flt2int_rtn(alpha * 65535.0f);`
`1205`	`1205`	`}`
`1206`	`1206`
	`1207`	`+ physical_compressed_block pcb;`
	`1208`	`+ symbolic_to_physical(bsd, scb, pcb);`
	`1209`	`+ physical_to_symbolic(bsd, pcb, scb);`
`1207`	`1210`	`return;`
`1208`	`1211`	`}`
`1209`	`1212`
`@@ -1447,7 +1450,6 @@ void compress_symbolic_block(`
`1447`	`1450`	`}`
`1448`	`1451`	`}`
`1449`	`1452`
`1450`		`-`
`1451`	`1453`	`// Modes 7, 10 (13 is unreachable)`
`1452`	`1454`	`best_errorvals_in_modes[3 * (partition_count - 2) + 5 + 2] = best_errorval_in_mode;`
`1453`	`1455`
`@@ -1460,8 +1462,9 @@ void compress_symbolic_block(`
`1460`	`1462`
`1461`	`1463`	`END_OF_TESTS:`
`1462`	`1464`	`// compress/decompress to a physical block`
`1463`		`- physical_compressed_block psb = symbolic_to_physical(bsd, scb);`
`1464`		`- physical_to_symbolic(bsd, psb, scb);`
	`1465`	`+ physical_compressed_block pcb;`
	`1466`	`+ symbolic_to_physical(bsd, scb, pcb);`
	`1467`	`+ physical_to_symbolic(bsd, pcb, scb);`
`1465`	`1468`	`}`
`1466`	`1469`
`1467`	`1470`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`#include "astcenc_internal.h"`
`26`	`26`
`27`	`27`	`// conversion functions between the LNS representation and the FP16 representation.`
`28`		`-float float_to_lns(float p)`
	`28`	`+static float float_to_lns(float p)`
`29`	`29`	`{`
`30`	`30`	`if (astc::isnan(p) \|\| p <= 1.0f / 67108864.0f)`
`31`	`31`	`{`
`@@ -66,7 +66,7 @@ float float_to_lns(float p)`
`66`	`66`	`return p1 + 1.0f;`
`67`	`67`	`}`
`68`	`68`
`69`		`-uint16_t lns_to_sf16(uint16_t p)`
	`69`	`+static uint16_t lns_to_sf16(uint16_t p)`
`70`	`70`	`{`
`71`	`71`	`uint16_t mc = p & 0x7FF;`
`72`	`72`	`uint16_t ec = p >> 11;`
Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ static const uint8_t integer_of_trits[3][3][3][3][3] = {`
`329`	`329`	`}`
`330`	`330`	`};`
`331`	`331`
`332`		`-void find_number_of_bits_trits_quints(`
	`332`	`+static void find_number_of_bits_trits_quints(`
`333`	`333`	`int quantization_level,`
`334`	`334`	`int* bits,`
`335`	`335`	`int* trits,`