Use load/store rather than fetch/write naming

solidpixel · solidpixel · commit 39f5b01c32c8 · 2022-05-09T23:16:23.000+01:00
diff --git a/Source/astcenc_entry.cpp b/Source/astcenc_entry.cpp
@@ -842,7 +842,6 @@ static void compress_image(
 	// Only the first thread actually runs the initializer
 	ctx.manage_compress.init(block_count);
 
-
 	// Determine if we can use an optimized load function
 	bool needs_swz = (swizzle.r != ASTCENC_SWZ_R) || (swizzle.g != ASTCENC_SWZ_G) ||
 	                 (swizzle.b != ASTCENC_SWZ_B) || (swizzle.a != ASTCENC_SWZ_A);
@@ -853,10 +852,10 @@ static void compress_image(
 	bool use_fast_load = !needs_swz && !needs_hdr &&
 	                     block_z == 1 && image.data_type == ASTCENC_TYPE_U8;
 
-	auto load_func = fetch_image_block;
+	auto load_func = load_image_block;
 	if (use_fast_load)
 	{
-		load_func = fetch_image_block_fast_ldr;
+		load_func = load_image_block_fast_ldr;
 	}
 
 	// All threads run this processing loop until there is no work remaining
@@ -1143,7 +1142,7 @@ astcenc_error astcenc_decompress_image(
 			                          x * block_x, y * block_y, z * block_z,
 			                          scb, blk);
 
-			write_image_block(image_out, blk, *ctx->bsd,
+			store_image_block(image_out, blk, *ctx->bsd,
 			                  x * block_x, y * block_y, z * block_z, *swizzle);
 		}
 
diff --git a/Source/astcenc_image.cpp b/Source/astcenc_image.cpp
@@ -148,7 +148,7 @@ static vfloat4 encode_texel_lns(
 }
 
 /* See header for documentation. */
-void fetch_image_block(
+void load_image_block(
 	astcenc_profile decode_mode,
 	const astcenc_image& img,
 	image_block& blk,
@@ -265,7 +265,7 @@ void fetch_image_block(
 }
 
 /* See header for documentation. */
-void fetch_image_block_fast_ldr(
+void load_image_block_fast_ldr(
 	astcenc_profile decode_mode,
 	const astcenc_image& img,
 	image_block& blk,
@@ -332,7 +332,7 @@ void fetch_image_block_fast_ldr(
 }
 
 /* See header for documentation. */
-void write_image_block(
+void store_image_block(
 	astcenc_image& img,
 	const image_block& blk,
 	const block_size_descriptor& bsd,
diff --git a/Source/astcenc_internal.h b/Source/astcenc_internal.h
@@ -1761,7 +1761,7 @@ void compute_averages(
 	const avg_args& ag);
 
 /**
- * @brief Fetch a single image block from the input image.
+ * @brief Load a single image block from the input image.
  *
  * @param      decode_mode   The compression color profile.
  * @param      img           The input image data.
@@ -1772,7 +1772,7 @@ void compute_averages(
  * @param      zpos          The block Z coordinate in the input image.
  * @param      swz           The swizzle to apply on load.
  */
-void fetch_image_block(
+void load_image_block(
 	astcenc_profile decode_mode,
 	const astcenc_image& img,
 	image_block& blk,
@@ -1783,7 +1783,7 @@ void fetch_image_block(
 	const astcenc_swizzle& swz);
 
 /**
- * @brief Fetch a single image block from the input image.
+ * @brief Load a single image block from the input image.
  *
  * This specialized variant can be used only if the block is 2D LDR U8 data,
  * with no swizzle.
@@ -1797,7 +1797,7 @@ void fetch_image_block(
  * @param      zpos          The block Z coordinate in the input image.
  * @param      swz           The swizzle to apply on load.
  */
-void fetch_image_block_fast_ldr(
+void load_image_block_fast_ldr(
 	astcenc_profile decode_mode,
 	const astcenc_image& img,
 	image_block& blk,
@@ -1808,17 +1808,17 @@ void fetch_image_block_fast_ldr(
 	const astcenc_swizzle& swz);
 
 /**
- * @brief Write a single image block from the output image.
+ * @brief Store a single image block to the output image.
  *
- * @param[out] img           The input image data.
- * @param      blk           The image block to populate.
+ * @param[out] img           The output image data.
+ * @param      blk           The image block to export.
  * @param      bsd           The block size information.
  * @param      xpos          The block X coordinate in the input image.
  * @param      ypos          The block Y coordinate in the input image.
  * @param      zpos          The block Z coordinate in the input image.
  * @param      swz           The swizzle to apply on store.
  */
-void write_image_block(
+void store_image_block(
 	astcenc_image& img,
 	const image_block& blk,
 	const block_size_descriptor& bsd,
