Shrink types and reorder the BSD

solidpixel · solidpixel · commit 8ea0299dc3cc · 2021-05-23T22:42:14.000+01:00
diff --git a/Source/astcenc_block_sizes.cpp b/Source/astcenc_block_sizes.cpp
@@ -720,7 +720,6 @@ static void assign_kmeans_texels(
 			bsd.kmeans_texels[i] = i;
 		}
 
-		bsd.kmeans_texel_count = bsd.texel_count;
 		return;
 	}
 
@@ -747,8 +746,6 @@ static void assign_kmeans_texels(
 			seen[texel] = true;
 		}
 	}
-
-	bsd.kmeans_texel_count = BLOCK_MAX_KMEANS_TEXELS;
 }
 
 /**
diff --git a/Source/astcenc_find_best_partitioning.cpp b/Source/astcenc_find_best_partitioning.cpp
@@ -453,7 +453,7 @@ static void compute_kmeans_partition_ordering(
 
 	// Construct the block bitmaps of texel assignments to each partition
 	uint64_t bitmaps[BLOCK_MAX_PARTITIONS] { 0 };
-	unsigned int texels_to_process = bsd.kmeans_texel_count;
+	unsigned int texels_to_process = astc::min(bsd.texel_count, BLOCK_MAX_KMEANS_TEXELS);
 	promise(texels_to_process > 0);
 	for (unsigned int i = 0; i < texels_to_process; i++)
 	{
diff --git a/Source/astcenc_internal.h b/Source/astcenc_internal.h
@@ -79,7 +79,7 @@ static constexpr unsigned int BLOCK_MAX_PARTITIONINGS { 1024 };
 static constexpr unsigned int BLOCK_MAX_TEXELS { 216 };
 
 /** @brief The maximum number of weights used during partition selection for texel clustering. */
-static constexpr unsigned int BLOCK_MAX_KMEANS_TEXELS { 64 };
+static constexpr uint8_t BLOCK_MAX_KMEANS_TEXELS { 64 };
 
 /** @brief The maximum number of weights a block can support. */
 static constexpr unsigned int BLOCK_MAX_WEIGHTS { 64 };
@@ -514,8 +514,8 @@ struct decimation_info
  */
 struct block_mode
 {
-	int16_t mode_index;
-	int8_t decimation_mode;
+	uint16_t mode_index;
+	uint8_t decimation_mode;
 	uint8_t quant_mode;
 	uint8_t is_dual_plane : 1;
 	uint8_t percentile_hit : 1;
@@ -560,44 +560,41 @@ struct decimation_mode
 struct block_size_descriptor
 {
 	/** @brief The block X dimension, in texels. */
-	unsigned int xdim;
+	uint8_t xdim;
 
 	/** @brief The block Y dimension, in texels. */
-	unsigned int ydim;
+	uint8_t ydim;
 
 	/** @brief The block Z dimension, in texels. */
-	unsigned int zdim;
+	uint8_t zdim;
 
 	/** @brief The block total texel count. */
-	unsigned int texel_count;
+	uint8_t texel_count;
 
 	/** @brief The number of stored decimation modes. */
 	unsigned int decimation_mode_count;
 
+	/** @brief The number of stored block modes. */
+	unsigned int block_mode_count;
+
 	/** @brief The active decimation modes, stored in low indices. */
 	decimation_mode decimation_modes[WEIGHTS_MAX_DECIMATION_MODES];
 
 	/** @brief The active decimation tables, stored in low indices. */
 	const decimation_info *decimation_tables[WEIGHTS_MAX_DECIMATION_MODES];
 
-	/** @brief The number of stored block modes. */
-	unsigned int block_mode_count;
-
 	/** @brief The packed block mode array index, or @c BLOCK_BAD_BLOCK_MODE if not active. */
 	uint16_t block_mode_packed_index[WEIGHTS_MAX_BLOCK_MODES];
 
 	/** @brief The active block modes, stored in low indices. */
 	block_mode block_modes[WEIGHTS_MAX_BLOCK_MODES];
 
-	/** @brief The texel count for k-means partition selection. */
-	unsigned int kmeans_texel_count;
-
-	/** @brief The active texels for k-means partition selection. */
-	unsigned int kmeans_texels[BLOCK_MAX_KMEANS_TEXELS];
-
 	/** @brief The partion tables for all of the possible partitions. */
 	partition_info partitions[(3 * BLOCK_MAX_PARTITIONINGS) + 1];
 
+	/** @brief The active texels for k-means partition selection. */
+	uint8_t kmeans_texels[BLOCK_MAX_KMEANS_TEXELS];
+
 	/**
 	 * @brief Get the block mode structure for index @c block_mode.
 	 *
diff --git a/Source/astcenc_partition_tables.cpp b/Source/astcenc_partition_tables.cpp
@@ -348,7 +348,7 @@ static void generate_one_partition_info_entry(
 		pi.coverage_bitmaps[i] = 0ULL;
 	}
 
-	unsigned int texels_to_process = bsd.kmeans_texel_count;
+	unsigned int texels_to_process = astc::min(bsd.texel_count, BLOCK_MAX_KMEANS_TEXELS);
 	for (unsigned int i = 0; i < texels_to_process; i++)
 	{
 		unsigned int idx = bsd.kmeans_texels[i];

Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,6 @@ static void assign_kmeans_texels(`
`720`	`720`	`bsd.kmeans_texels[i] = i;`
`721`	`721`	`}`
`722`	`722`
`723`		`- bsd.kmeans_texel_count = bsd.texel_count;`
`724`	`723`	`return;`
`725`	`724`	`}`
`726`	`725`
`@@ -747,8 +746,6 @@ static void assign_kmeans_texels(`
`747`	`746`	`seen[texel] = true;`
`748`	`747`	`}`
`749`	`748`	`}`
`750`		`-`
`751`		`- bsd.kmeans_texel_count = BLOCK_MAX_KMEANS_TEXELS;`
`752`	`749`	`}`
`753`	`750`
`754`	`751`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ static void compute_kmeans_partition_ordering(`
`453`	`453`
`454`	`454`	`// Construct the block bitmaps of texel assignments to each partition`
`455`	`455`	`uint64_t bitmaps[BLOCK_MAX_PARTITIONS] { 0 };`
`456`		`- unsigned int texels_to_process = bsd.kmeans_texel_count;`
	`456`	`+ unsigned int texels_to_process = astc::min(bsd.texel_count, BLOCK_MAX_KMEANS_TEXELS);`
`457`	`457`	`promise(texels_to_process > 0);`
`458`	`458`	`for (unsigned int i = 0; i < texels_to_process; i++)`
`459`	`459`	`{`
Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ static void generate_one_partition_info_entry(`
`348`	`348`	`pi.coverage_bitmaps[i] = 0ULL;`
`349`	`349`	`}`
`350`	`350`
`351`		`- unsigned int texels_to_process = bsd.kmeans_texel_count;`
	`351`	`+ unsigned int texels_to_process = astc::min(bsd.texel_count, BLOCK_MAX_KMEANS_TEXELS);`
`352`	`352`	`for (unsigned int i = 0; i < texels_to_process; i++)`
`353`	`353`	`{`
`354`	`354`	`unsigned int idx = bsd.kmeans_texels[i];`