commit 24ba5ded222daec782d121985eb80bf8d7b84918
author Rich Geldreich <richgel99@gmail.com> Wed Apr 14 23:50:22 2021 -0400
committer GitHub <noreply@github.com> Wed Apr 14 23:50:22 2021 -0400
tree bc8d745019af1e04464ca45e1a6313506fb2df06
parent f3f7f750bb1fa8e00765b42c5de7155931006247
parent aee16b4eab762cf7ffecdd80558cff7fd0d54249

Merge pull request #214 from zeux/trial_errors

Optimize find_optimal_selector_clusters_for_each_block

encoder/basisu_frontend.cpp

diff --git a/encoder/basisu_frontend.cpp b/encoder/basisu_frontend.cpp
index 8292abd..324fc8e 100644
--- a/encoder/basisu_frontend.cpp
+++ b/encoder/basisu_frontend.cpp
@@ -2196,6 +2196,17 @@
 					color_rgba trial_block_colors[4];
 					blk.get_block_colors(trial_block_colors, 0);
 
+					// precompute errors for the i-th block pixel and selector sel: [sel][i]
+					uint32_t trial_errors[4][16];
+
+					for (int sel = 0; sel < 4; ++sel)
+					{
+						for (int i = 0; i < 16; ++i)
+						{
+							trial_errors[sel][i] = color_distance(m_params.m_perceptual, pBlock_pixels[i], trial_block_colors[sel], false);
+						}
+					}
+
 					uint64_t best_cluster_err = INT64_MAX;
 					uint32_t best_cluster_index = 0;
 
@@ -2249,7 +2260,7 @@
 							{
 								const uint32_t sel = unpacked_optimized_cluster_selectors[cluster_index * 16 + i];
 										
-								trial_err += color_distance(true, trial_block_colors[sel], pBlock_pixels[i], false);
+								trial_err += trial_errors[sel][i];
 								if (trial_err > best_cluster_err)
 									goto early_out;
 							}
@@ -2280,7 +2291,7 @@
 							{
 								const uint32_t sel = unpacked_optimized_cluster_selectors[cluster_index * 16 + i];
 
-								trial_err += color_distance(false, trial_block_colors[sel], pBlock_pixels[i], false);
+								trial_err += trial_errors[sel][i];
 								if (trial_err > best_cluster_err)
 									goto early_out2;
 							}