Style cleanups

solidpixel · solidpixel · commit 5cd89c3b1786 · 2021-04-30T20:54:30.000+01:00
diff --git a/Source/astcenc_compress_symbolic.cpp b/Source/astcenc_compress_symbolic.cpp
@@ -101,8 +101,7 @@ static bool realign_weights(
 			epd = select(epd, vint4::zero(), plane_mask);
 
 			endpnt0f[pa_idx] = int_to_float(endpnt0[pa_idx]);
-			offset[pa_idx] = int_to_float(epd);
-			offset[pa_idx] = offset[pa_idx] * (1.0f / 64.0f);
+			offset[pa_idx] = int_to_float(epd) * (1.0f / 64.0f);
 		}
 
 		// Create an unquantized weight grid for this decimation level
diff --git a/Source/astcenc_image.cpp b/Source/astcenc_image.cpp
@@ -220,7 +220,7 @@ void fetch_imageblock(
 			{
 				int xi = astc::min(xpos + x, xsize - 1);
 
-				vfloat4 datav = loader(plane, (4 * xsize * yi) + (4 * xi    ));
+				vfloat4 datav = loader(plane, (4 * xsize * yi) + (4 * xi));
 				datav = swizzler(datav, swz);
 				datav = converter(datav, lns_mask);
 
diff --git a/Source/astcenc_weight_align.cpp b/Source/astcenc_weight_align.cpp
@@ -255,6 +255,7 @@ static void compute_angular_endpoints_for_quant_levels(
 	vfloat4 best_results[40];
 
 	// Initialize the array to some safe defaults
+	promise(max_quant_steps > 0);
 	for (int i = 0; i < (max_quant_steps + 4); i++)
 	{
 		// Lane<0> = Best error

Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,7 @@ static bool realign_weights(`
`101`	`101`	`epd = select(epd, vint4::zero(), plane_mask);`
`102`	`102`
`103`	`103`	`endpnt0f[pa_idx] = int_to_float(endpnt0[pa_idx]);`
`104`		`- offset[pa_idx] = int_to_float(epd);`
`105`		`- offset[pa_idx] = offset[pa_idx] * (1.0f / 64.0f);`
	`104`	`+ offset[pa_idx] = int_to_float(epd) * (1.0f / 64.0f);`
`106`	`105`	`}`
`107`	`106`
`108`	`107`	`// Create an unquantized weight grid for this decimation level`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ void fetch_imageblock(`
`220`	`220`	`{`
`221`	`221`	`int xi = astc::min(xpos + x, xsize - 1);`
`222`	`222`
`223`		`- vfloat4 datav = loader(plane, (4 * xsize * yi) + (4 * xi ));`
	`223`	`+ vfloat4 datav = loader(plane, (4 * xsize * yi) + (4 * xi));`
`224`	`224`	`datav = swizzler(datav, swz);`
`225`	`225`	`datav = converter(datav, lns_mask);`
`226`	`226`
Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,7 @@ static void compute_angular_endpoints_for_quant_levels(`
`255`	`255`	`vfloat4 best_results[40];`
`256`	`256`
`257`	`257`	`// Initialize the array to some safe defaults`
	`258`	`+ promise(max_quant_steps > 0);`
`258`	`259`	`for (int i = 0; i < (max_quant_steps + 4); i++)`
`259`	`260`	`{`
`260`	`261`	`// Lane<0> = Best error`