Rename imageblock to image_block

solidpixel · solidpixel · commit a01f3bda4dc4 · 2021-05-31T23:45:13.000+01:00
diff --git a/Source/astcenc_averages_and_directions.cpp b/Source/astcenc_averages_and_directions.cpp
@@ -27,7 +27,7 @@
 /* See header for documentation. */
 void compute_avgs_and_dirs_4_comp(
 	const partition_info& pi,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	partition_metrics pm[BLOCK_MAX_PARTITIONS]
 ) {
@@ -136,7 +136,7 @@ void compute_avgs_and_dirs_4_comp(
 /* See header for documentation. */
 void compute_avgs_and_dirs_3_comp(
 	const partition_info& pi,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	unsigned int omitted_component,
 	partition_metrics pm[BLOCK_MAX_PARTITIONS]
@@ -286,7 +286,7 @@ void compute_avgs_and_dirs_3_comp(
 /* See header for documentation. */
 void compute_avgs_and_dirs_2_comp(
 	const partition_info& pt,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	unsigned int component1,
 	unsigned int component2,
@@ -407,7 +407,7 @@ void compute_avgs_and_dirs_2_comp(
 /* See header for documentation. */
 void compute_error_squared_rgba(
 	const partition_info& pi,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	const processed_line4 uncor_plines[BLOCK_MAX_PARTITIONS],
 	const processed_line4 samec_plines[BLOCK_MAX_PARTITIONS],
@@ -565,7 +565,7 @@ void compute_error_squared_rgba(
 /* See header for documentation. */
 void compute_error_squared_rgb(
 	const partition_info& pi,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	partition_lines3 plines[BLOCK_MAX_PARTITIONS],
 	float& uncor_error,
diff --git a/Source/astcenc_compress_symbolic.cpp b/Source/astcenc_compress_symbolic.cpp
@@ -70,7 +70,7 @@ static void merge_endpoints(
 static bool realign_weights(
 	astcenc_profile decode_mode,
 	const block_size_descriptor& bsd,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	symbolic_compressed_block& scb,
 	uint8_t* weight_set8_plane1,
@@ -232,7 +232,7 @@ static bool realign_weights(
 static float compress_symbolic_block_for_partition_1plane(
 	const astcenc_config& config,
 	const block_size_descriptor& bsd,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	bool only_always,
 	float tune_errorval_threshold,
@@ -585,7 +585,7 @@ static float compress_symbolic_block_for_partition_1plane(
 static float compress_symbolic_block_for_partition_2planes(
 	const astcenc_config& config,
 	const block_size_descriptor& bsd,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	float tune_errorval_threshold,
 	unsigned int partition_count,
@@ -1025,7 +1025,7 @@ static float prepare_error_weight_block(
 	const astcenc_context& ctx,
 	const astcenc_image& image,
 	const block_size_descriptor& bsd,
-	const imageblock& blk,
+	const image_block& blk,
 	error_weight_block& ewb
 ) {
 	unsigned int idx = 0;
@@ -1226,7 +1226,7 @@ static float prepare_error_weight_block(
  */
 static float prepare_block_statistics(
 	int texels_per_block,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb
 ) {
 	// Compute covariance matrix, as a collection of 10 scalars that form the upper-triangular row
@@ -1360,7 +1360,7 @@ enum trial_modes {
 void compress_block(
 	const astcenc_context& ctx,
 	const astcenc_image& input_image,
-	const imageblock& blk,
+	const image_block& blk,
 	physical_compressed_block& pcb,
 	compression_working_buffers& tmpbuf)
 {
diff --git a/Source/astcenc_decompress_symbolic.cpp b/Source/astcenc_decompress_symbolic.cpp
@@ -180,7 +180,7 @@ void decompress_symbolic_block(
 	int ypos,
 	int zpos,
 	const symbolic_compressed_block& scb,
-	imageblock& blk
+	image_block& blk
 ) {
 	blk.xpos = xpos;
 	blk.ypos = ypos;
@@ -323,7 +323,7 @@ float compute_symbolic_block_difference(
 	const astcenc_config& config,
 	const block_size_descriptor& bsd,
 	const symbolic_compressed_block& scb,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb
 ) {
 	// If we detected an error-block, blow up immediately.
diff --git a/Source/astcenc_entry.cpp b/Source/astcenc_entry.cpp
@@ -846,7 +846,7 @@ static void compress_image(
 ) {
 	const block_size_descriptor *bsd = ctx.bsd;
 	astcenc_profile decode_mode = ctx.config.profile;
-	imageblock blk;
+	image_block blk;
 
 	int block_x = bsd->xdim;
 	int block_y = bsd->ydim;
@@ -927,7 +927,7 @@ static void compress_image(
 			// Fetch the full block for compression
 			if (use_full_block)
 			{
-				fetch_imageblock(decode_mode, image, blk, *bsd, x * block_x, y * block_y, z * block_z, swizzle);
+				fetch_image_block(decode_mode, image, blk, *bsd, x * block_x, y * block_y, z * block_z, swizzle);
 			}
 			// Apply alpha scale RDO - substitute constant color block
 			else
@@ -1121,7 +1121,7 @@ astcenc_error astcenc_decompress_image(
 		return ASTCENC_ERR_OUT_OF_MEM;
 	}
 
-	imageblock blk;
+	image_block blk;
 
 	// If context thread count is one then implicitly reset
 	if (ctx->thread_count == 1)
@@ -1161,7 +1161,7 @@ astcenc_error astcenc_decompress_image(
 			                          x * block_x, y * block_y, z * block_z,
 			                          scb, blk);
 
-			write_imageblock(image_out, blk, *ctx->bsd,
+			write_image_block(image_out, blk, *ctx->bsd,
 			                 x * block_x, y * block_y, z * block_z, *swizzle);
 		}
 
diff --git a/Source/astcenc_find_best_partitioning.cpp b/Source/astcenc_find_best_partitioning.cpp
@@ -57,7 +57,7 @@
  * @param[out] cluster_centers   The initital partition cluster center colors.
  */
 static void kmeans_init(
-	const imageblock& blk,
+	const image_block& blk,
 	unsigned int texel_count,
 	unsigned int partition_count,
 	vfloat4 cluster_centers[BLOCK_MAX_PARTITIONS]
@@ -143,7 +143,7 @@ static void kmeans_init(
  * @param[out] partition_of_texel   The partition assigned for each texel.
  */
 static void kmeans_assign(
-	const imageblock& blk,
+	const image_block& blk,
 	unsigned int texel_count,
 	unsigned int partition_count,
 	const vfloat4 cluster_centers[BLOCK_MAX_PARTITIONS],
@@ -207,7 +207,7 @@ static void kmeans_assign(
  * @param       partition_of_texel   The partition assigned for each texel.
  */
 static void kmeans_update(
-	const imageblock& blk,
+	const image_block& blk,
 	unsigned int texel_count,
 	unsigned int partition_count,
 	vfloat4 cluster_centers[BLOCK_MAX_PARTITIONS],
@@ -429,7 +429,7 @@ static void get_partition_ordering_by_mismatch_bits(
   */
 static void compute_kmeans_partition_ordering(
 	const block_size_descriptor& bsd,
-	const imageblock& blk,
+	const image_block& blk,
 	unsigned int partition_count,
 	unsigned int partition_ordering[BLOCK_MAX_PARTITIONINGS]
 ) {
@@ -472,7 +472,7 @@ static void compute_kmeans_partition_ordering(
 /* See header for documentation. */
 void find_best_partition_candidates(
 	const block_size_descriptor& bsd,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	unsigned int partition_count,
 	unsigned int partition_search_limit,
diff --git a/Source/astcenc_ideal_endpoints_and_weights.cpp b/Source/astcenc_ideal_endpoints_and_weights.cpp
@@ -38,7 +38,7 @@
  */
 static void compute_ideal_colors_and_weights_1_comp(
 	const block_size_descriptor& bsd,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	const partition_info& pi,
 	endpoints_and_weights& ei,
@@ -155,7 +155,7 @@ static void compute_ideal_colors_and_weights_1_comp(
  */
 static void compute_ideal_colors_and_weights_2_comp(
 	const block_size_descriptor& bsd,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	const partition_info& pi,
 	endpoints_and_weights& ei,
@@ -312,7 +312,7 @@ static void compute_ideal_colors_and_weights_2_comp(
  */
 static void compute_ideal_colors_and_weights_3_comp(
 	const block_size_descriptor& bsd,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	const partition_info& pi,
 	endpoints_and_weights& ei,
@@ -487,7 +487,7 @@ static void compute_ideal_colors_and_weights_3_comp(
  */
 static void compute_ideal_colors_and_weights_4_comp(
 	const block_size_descriptor& bsd,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	const partition_info& pi,
 	endpoints_and_weights& ei
@@ -599,7 +599,7 @@ static void compute_ideal_colors_and_weights_4_comp(
 /* See header for documentation. */
 void compute_ideal_colors_and_weights_1plane(
 	const block_size_descriptor& bsd,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	const partition_info& pi,
 	endpoints_and_weights& ei
@@ -617,7 +617,7 @@ void compute_ideal_colors_and_weights_1plane(
 /* See header for documentation. */
 void compute_ideal_colors_and_weights_2planes(
 	const block_size_descriptor& bsd,
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	const partition_info& pi,
 	unsigned int plane2_component,
@@ -1045,7 +1045,7 @@ static inline vfloat4 compute_rgbo_vector(
 
 /* See header for documentation. */
 void recompute_ideal_colors_1plane(
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	const partition_info& pi,
 	const decimation_info& di,
@@ -1248,7 +1248,7 @@ void recompute_ideal_colors_1plane(
 
 /* See header for documentation. */
 void recompute_ideal_colors_2planes(
-	const imageblock& blk,
+	const image_block& blk,
 	const error_weight_block& ewb,
 	const partition_info& pi,
 	const decimation_info& di,
diff --git a/Source/astcenc_image.cpp b/Source/astcenc_image.cpp
@@ -148,10 +148,10 @@ static vfloat4 encode_texel_lns(
 }
 
 /* See header for documentation. */
-void fetch_imageblock(
+void fetch_image_block(
 	astcenc_profile decode_mode,
 	const astcenc_image& img,
-	imageblock& blk,
+	image_block& blk,
 	const block_size_descriptor& bsd,
 	unsigned int xpos,
 	unsigned int ypos,
@@ -264,9 +264,9 @@ void fetch_imageblock(
 }
 
 /* See header for documentation. */
-void write_imageblock(
+void write_image_block(
 	astcenc_image& img,
-	const imageblock& blk,
+	const image_block& blk,
 	const block_size_descriptor& bsd,
 	unsigned int xpos,
 	unsigned int ypos,
diff --git a/Source/astcenc_internal.h b/Source/astcenc_internal.h
diff --git a/Source/astcenc_pick_best_endpoint_format.cpp b/Source/astcenc_pick_best_endpoint_format.cpp
