drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tweak endpoint refinement.

Browse Source
This commit is contained in:
Ignacio 2020-03-30 16:35:17 -07:00
parent 5eac5a4859
commit f68d894b8b
1 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/nvtt/CompressorDXT1.cpp
View File

@ -1048,77 +1048,79 @@ float nv::compress_dxt1(const Vector4 input_colors[16], const float input_weight
compress_dxt1_cluster_fit(input_colors, colors, weights, count, color_weights, three_color_mode, &cluster_fit_output); compress_dxt1_cluster_fit(input_colors, colors, weights, count, color_weights, three_color_mode, &cluster_fit_output);
float cluster_fit_error = evaluate_mse(input_colors, input_weights, color_weights, &cluster_fit_output); float cluster_fit_error = evaluate_mse(input_colors, input_weights, color_weights, &cluster_fit_output);
if (cluster_fit_error < error) { if (cluster_fit_error < error) {
*output = cluster_fit_output; *output = cluster_fit_output;
error = cluster_fit_error; error = cluster_fit_error;
}
/*if (hq && cluster_fit_output.isFourColorMode()) { if (hq) {
// TODO:
// Refine color for the selected indices. // - Optimize palette evaluation when updating only one channel.
Vector3 c0, c1; // - try all diagonals.
if (optimize_end_points4(output->indices, input_colors, 16, &c0, &c1)) {
BlockDXT1 box_fit_output;
output_block4(input_colors, color_weights, c0, c1, &box_fit_output);
float box_fit_error = evaluate_mse(input_colors, input_weights, color_weights, &box_fit_output); // Things that don't help:
if (box_fit_error < error) { // - Alternate endpoint updates.
error = box_fit_error; // - Randomize order.
*output = box_fit_output; // - If one direction does not improve, test opposite direction next.
}
}
}*/
if (hq) { static const int8 deltas[16][3] = {
int8 deltas[16][3] = { {1,0,0},
{1,0,0}, {0,1,0},
{0,1,0}, {0,0,1},
{0,0,1},
{-1,0,0}, {-1,0,0},
{0,-1,0}, {0,-1,0},
{0,0,-1}, {0,0,-1},
{1,1,0}, {1,1,0},
{1,0,1}, {1,0,1},
{0,1,1}, {0,1,1},
{-1,-1,0}, {-1,-1,0},
{-1,0,-1}, {-1,0,-1},
{0,-1,-1}, {0,-1,-1},
{-1,1,0}, {-1,1,0},
//{-1,0,1}, //{-1,0,1},
{1,-1,0}, {1,-1,0},
{0,-1,1}, {0,-1,1},
//{1,0,-1}, //{1,0,-1},
{0,1,-1}, {0,1,-1},
}; };
int lastImprovement = 0;
for (int i = 0; i < 256; i++) {
BlockDXT1 refined = *output; BlockDXT1 refined = *output;
for (int i = 0; i < 10000; i++) { int8 delta[3] = { deltas[i % 16][0], deltas[i % 16][1], deltas[i % 16][2] };
int rnd = i * 2654435761;
int8 delta[3] = { deltas[rnd % 16][0], deltas[rnd % 16][1], deltas[rnd % 16][2] };
if ((rnd / 16) & 1) { if ((i / 16) & 1) {
refined.col0.r += delta[0]; refined.col0.r += delta[0];
refined.col0.g += delta[1]; refined.col0.g += delta[1];
refined.col0.b += delta[2]; refined.col0.b += delta[2];
}
else {
refined.col1.r += delta[0];
refined.col1.g += delta[1];
refined.col1.b += delta[2];
}
float refined_error = evaluate_mse(input_colors, input_weights, color_weights, &refined);
if (refined_error < error) {
*output = refined;
error = refined_error;
}
} }
else {
refined.col1.r += delta[0];
refined.col1.g += delta[1];
refined.col1.b += delta[2];
}
Vector3 palette[4];
evaluate_palette(output->col0, output->col1, palette);
refined.indices = compute_indices(input_colors, color_weights, palette);
float refined_error = evaluate_mse(input_colors, input_weights, color_weights, &refined);
if (refined_error < error) {
*output = refined;
error = refined_error;
lastImprovement = i;
}
// Early out if the last 32 steps didn't improve error.
if (i - lastImprovement > 32) break;
} }
} }
} }