Standardize on blk for image block variables

solidpixel · solidpixel · commit 7ae38a14cd5f · 2021-02-20T11:31:17.000Z
diff --git a/Source/astcenc_decompress_symbolic.cpp b/Source/astcenc_decompress_symbolic.cpp
@@ -285,7 +285,7 @@ float compute_symbolic_block_difference(
 	astcenc_profile decode_mode,
 	const block_size_descriptor* bsd,
 	const symbolic_compressed_block* scb,
-	const imageblock* pb,
+	const imageblock* blk,
 	const error_weight_block *ewb
 ) {
 	// if we detected an error-block, blow up immediately.
@@ -394,7 +394,7 @@ float compute_symbolic_block_difference(
 		                               plane2_weights[i],
 		                               plane2_mask);
 
-		vfloat4 oldColor = pb->texel(i);
+		vfloat4 oldColor = blk->texel(i);
 
 		vfloat4 error = oldColor - color;
 
diff --git a/Source/astcenc_encoding_choice_error.cpp b/Source/astcenc_encoding_choice_error.cpp
@@ -150,7 +150,7 @@ static void compute_error_squared_rgb_single_partition(
  */
 void compute_encoding_choice_errors(
 	const block_size_descriptor* bsd,
-	const imageblock* pb,
+	const imageblock* blk,
 	const partition_info* pt,
 	const error_weight_block* ewb,
 	int separate_component,	// component that is separated out in 2-plane mode, -1 in 1-plane mode
@@ -168,19 +168,19 @@ void compute_encoding_choice_errors(
 	vfloat4 color_scalefactors[4];
 
 	compute_partition_error_color_weightings(bsd, ewb, pt, error_weightings, color_scalefactors);
-	compute_avgs_and_dirs_3_comp(pt, pb, ewb, color_scalefactors, 3, averages, directions_rgb);
+	compute_avgs_and_dirs_3_comp(pt, blk, ewb, color_scalefactors, 3, averages, directions_rgb);
 
 	endpoints ep;
 	if (separate_component == -1)
 	{
 		endpoints_and_weights ei;
-		compute_endpoints_and_ideal_weights_1_plane(bsd, pt, pb, ewb, &ei);
+		compute_endpoints_and_ideal_weights_1_plane(bsd, pt, blk, ewb, &ei);
 		ep = ei.ep;
 	}
 	else
 	{
 		endpoints_and_weights ei1, ei2;
-		compute_endpoints_and_ideal_weights_2_planes(bsd, pt, pb, ewb, separate_component, &ei1, &ei2);
+		compute_endpoints_and_ideal_weights_2_planes(bsd, pt, blk, ewb, separate_component, &ei1, &ei2);
 		merge_endpoints(&(ei1.ep), &(ei2.ep), separate_component, &ep);
 	}
 
@@ -249,7 +249,7 @@ void compute_encoding_choice_errors(
 		proc_luminance_lines.bis = normalize(csf) * icsf;
 
 		compute_error_squared_rgb_single_partition(
-		    i, bsd, pt, pb, ewb,
+		    i, bsd, pt, blk, ewb,
 		    &proc_uncorr_rgb_lines,     &uncorr_rgb_error,
 		    &proc_samechroma_rgb_lines, &samechroma_rgb_error,
 		    &proc_rgb_luma_lines,       &rgb_luma_error,
diff --git a/Source/astcenc_entry.cpp b/Source/astcenc_entry.cpp
@@ -693,7 +693,7 @@ static void compress_image(
 	int block_z = bsd->zdim;
 	astcenc_profile decode_mode = ctx.config.profile;
 
-	imageblock pb;
+	imageblock blk;
 	int dim_x = image.dim_x;
 	int dim_y = image.dim_y;
 	int dim_z = image.dim_z;
@@ -770,22 +770,22 @@ static void compress_image(
 			// Fetch the full block for compression
 			if (use_full_block)
 			{
-				fetch_imageblock(decode_mode, image, &pb, bsd, x * block_x, y * block_y, z * block_z, swizzle);
+				fetch_imageblock(decode_mode, image, &blk, bsd, x * block_x, y * block_y, z * block_z, swizzle);
 			}
 			// Apply alpha scale RDO - substitute constant color block
 			else
 			{
-				pb.origin_texel = vfloat4::zero();
-				pb.data_min = vfloat4::zero();
-				pb.data_max = pb.data_min;
-				pb.grayscale = false;
+				blk.origin_texel = vfloat4::zero();
+				blk.data_min = vfloat4::zero();
+				blk.data_max = blk.data_min;
+				blk.grayscale = false;
 			}
 
 			int offset = ((z * yblocks + y) * xblocks + x) * 16;
 			uint8_t *bp = buffer + offset;
 			physical_compressed_block* pcb = reinterpret_cast<physical_compressed_block*>(bp);
 			symbolic_compressed_block scb;
-			compress_block(ctx, image, &pb, scb, *pcb, temp_buffers);
+			compress_block(ctx, image, &blk, scb, *pcb, temp_buffers);
 		}
 
 		ctx.manage_compress.complete_task_assignment(count);
@@ -943,7 +943,7 @@ astcenc_error astcenc_decompress_image(
 		return ASTCENC_ERR_OUT_OF_MEM;
 	}
 
-	imageblock pb;
+	imageblock blk;
 
 	for (unsigned int z = 0; z < zblocks; z++)
 	{
@@ -960,9 +960,9 @@ astcenc_error astcenc_decompress_image(
 
 				decompress_symbolic_block(context->config.profile, context->bsd,
 				                          x * block_x, y * block_y, z * block_z,
-				                          &scb, &pb);
+				                          &scb, &blk);
 
-				write_imageblock(image_out, &pb, context->bsd,
+				write_imageblock(image_out, &blk, context->bsd,
 				                 x * block_x, y * block_y, z * block_z, swizzle);
 			}
 		}
diff --git a/Source/astcenc_ideal_endpoints_and_weights.cpp b/Source/astcenc_ideal_endpoints_and_weights.cpp
@@ -1105,7 +1105,7 @@ void recompute_ideal_colors_2planes(
 	int plane2_color_component,	// color component for 2nd plane of weights; -1 if the 2nd plane of weights is not present
 	const partition_info* pt,
 	const decimation_table* it,
-	const imageblock* pb,	// picture-block containing the actual data.
+	const imageblock* blk,	// picture-block containing the actual data.
 	const error_weight_block* ewb
 ) {
 	const quantization_and_transfer_table *qat = &(quant_and_xfer_tables[weight_quant_mode]);
@@ -1139,7 +1139,7 @@ void recompute_ideal_colors_2planes(
 		{
 			int tix = texel_indexes[j];
 
-			vfloat4 rgba = pb->texel(tix);
+			vfloat4 rgba = blk->texel(tix);
 			vfloat4 error_weight(ewb->texel_weight_r[tix], ewb->texel_weight_g[tix], ewb->texel_weight_b[tix], ewb->texel_weight_a[tix]);
 
 			rgba_sum = rgba_sum + (rgba * error_weight);
@@ -1179,7 +1179,7 @@ void recompute_ideal_colors_2planes(
 		{
 			int tix = texel_indexes[j];
 
-			vfloat4 rgba = pb->texel(tix);
+			vfloat4 rgba = blk->texel(tix);
 			vfloat4 color_weight(ewb->texel_weight_r[tix], ewb->texel_weight_g[tix], ewb->texel_weight_b[tix], ewb->texel_weight_a[tix]);
 
 			vfloat4 color_weight3 = color_weight.swz<0, 1, 2>();
@@ -1437,7 +1437,7 @@ void recompute_ideal_colors_1plane(
 	const uint8_t* weight_set8,	// the current set of weight values
 	const partition_info* pt,
 	const decimation_table* it,
-	const imageblock* pb,	// picture-block containing the actual data.
+	const imageblock* blk,	// picture-block containing the actual data.
 	const error_weight_block* ewb
 ) {
 	int weight_count = it->weight_count;
@@ -1467,7 +1467,7 @@ void recompute_ideal_colors_1plane(
 		{
 			int tix = texel_indexes[j];
 
-			vfloat4 rgba = pb->texel(tix);
+			vfloat4 rgba = blk->texel(tix);
 			vfloat4 error_weight(ewb->texel_weight_r[tix], ewb->texel_weight_g[tix], ewb->texel_weight_b[tix], ewb->texel_weight_a[tix]);
 
 			rgba_sum = rgba_sum + (rgba * error_weight);
@@ -1501,7 +1501,7 @@ void recompute_ideal_colors_1plane(
 		{
 			int tix = texel_indexes[j];
 
-			vfloat4 rgba = pb->texel(tix);
+			vfloat4 rgba = blk->texel(tix);
 			vfloat4 color_weight(ewb->texel_weight_r[tix], ewb->texel_weight_g[tix], ewb->texel_weight_b[tix], ewb->texel_weight_a[tix]);
 
 			vfloat4 color_weight3 = color_weight.swz<0, 1, 2>();
diff --git a/Source/astcenc_image.cpp b/Source/astcenc_image.cpp
diff --git a/Source/astcenc_internal.h b/Source/astcenc_internal.h

Original file line number	Diff line number	Diff line change
`@@ -693,7 +693,7 @@ static void compress_image(`
`693`	`693`	`int block_z = bsd->zdim;`
`694`	`694`	`astcenc_profile decode_mode = ctx.config.profile;`
`695`	`695`
`696`		`- imageblock pb;`
	`696`	`+ imageblock blk;`
`697`	`697`	`int dim_x = image.dim_x;`
`698`	`698`	`int dim_y = image.dim_y;`
`699`	`699`	`int dim_z = image.dim_z;`
`@@ -770,22 +770,22 @@ static void compress_image(`
`770`	`770`	`// Fetch the full block for compression`
`771`	`771`	`if (use_full_block)`
`772`	`772`	`{`
`773`		`- fetch_imageblock(decode_mode, image, &pb, bsd, x * block_x, y * block_y, z * block_z, swizzle);`
	`773`	`+ fetch_imageblock(decode_mode, image, &blk, bsd, x * block_x, y * block_y, z * block_z, swizzle);`
`774`	`774`	`}`
`775`	`775`	`// Apply alpha scale RDO - substitute constant color block`
`776`	`776`	`else`
`777`	`777`	`{`
`778`		`- pb.origin_texel = vfloat4::zero();`
`779`		`- pb.data_min = vfloat4::zero();`
`780`		`- pb.data_max = pb.data_min;`
`781`		`- pb.grayscale = false;`
	`778`	`+ blk.origin_texel = vfloat4::zero();`
	`779`	`+ blk.data_min = vfloat4::zero();`
	`780`	`+ blk.data_max = blk.data_min;`
	`781`	`+ blk.grayscale = false;`
`782`	`782`	`}`
`783`	`783`
`784`	`784`	`int offset = ((z * yblocks + y) * xblocks + x) * 16;`
`785`	`785`	`uint8_t *bp = buffer + offset;`
`786`	`786`	`physical_compressed_block* pcb = reinterpret_cast<physical_compressed_block*>(bp);`
`787`	`787`	`symbolic_compressed_block scb;`
`788`		`- compress_block(ctx, image, &pb, scb, *pcb, temp_buffers);`
	`788`	`+ compress_block(ctx, image, &blk, scb, *pcb, temp_buffers);`
`789`	`789`	`}`
`790`	`790`
`791`	`791`	`ctx.manage_compress.complete_task_assignment(count);`
`@@ -943,7 +943,7 @@ astcenc_error astcenc_decompress_image(`
`943`	`943`	`return ASTCENC_ERR_OUT_OF_MEM;`
`944`	`944`	`}`
`945`	`945`
`946`		`- imageblock pb;`
	`946`	`+ imageblock blk;`
`947`	`947`
`948`	`948`	`for (unsigned int z = 0; z < zblocks; z++)`
`949`	`949`	`{`
`@@ -960,9 +960,9 @@ astcenc_error astcenc_decompress_image(`
`960`	`960`
`961`	`961`	`decompress_symbolic_block(context->config.profile, context->bsd,`
`962`	`962`	`x * block_x, y * block_y, z * block_z,`
`963`		`- &scb, &pb);`
	`963`	`+ &scb, &blk);`
`964`	`964`
`965`		`- write_imageblock(image_out, &pb, context->bsd,`
	`965`	`+ write_imageblock(image_out, &blk, context->bsd,`
`966`	`966`	`x * block_x, y * block_y, z * block_z, swizzle);`
`967`	`967`	`}`
`968`	`968`	`}`