Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Using MRSSE for HDR error calculations #528

Closed
wants to merge 4 commits into from
Closed

Using MRSSE for HDR error calculations #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e369e21
Prototype linear HDR error metrics.
solidpixel Nov 23, 2024
2e59e2a
Use relative sum of squares error for HDR textures
solidpixel Nov 23, 2024
1a3d558
Remove trace points
solidpixel Nov 23, 2024
f959f76
Use scalar test not any(vmask)
solidpixel Nov 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Source/astcenc_compress_symbolic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,9 @@ static float compress_symbolic_block_for_partition_1plane(

int max_weight_quant = astc::min(static_cast<int>(QUANT_32), quant_limit);

bool is_hdr = (config.profile == ASTCENC_PRF_HDR) || (config.profile == ASTCENC_PRF_HDR_RGB_LDR_A);
auto compute_difference = &compute_symbolic_block_difference_1plane;
if ((partition_count == 1) && !(config.flags & ASTCENC_FLG_MAP_RGBM))
if ((partition_count == 1) && !(config.flags & ASTCENC_FLG_MAP_RGBM) && !is_hdr)
{
compute_difference = &compute_symbolic_block_difference_1plane_1partition;
}
Expand Down
37 changes: 29 additions & 8 deletions Source/astcenc_decompress_symbolic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ float compute_symbolic_block_difference_2plane(
ep0, ep1);

vmask4 u8_mask = get_u8_component_mask(config.profile, blk);
bool any_lns = rgb_lns || a_lns;

// Unpack and compute error for each texel in the partition
unsigned int texel_count = bsd.texel_count;
Expand Down Expand Up @@ -395,11 +396,20 @@ float compute_symbolic_block_difference_2plane(
);
}

vfloat4 error = oldColor - color;
error = min(abs(error), 1e15f);
error = error * error;
// Compute sum of squared errors, weighted by channel weight
vfloat4 error = (oldColor - color);
error = dot(error, error * blk.channel_weight);

summa += min(dot(error, blk.channel_weight), ERROR_CALC_DEFAULT);
// Convert this relative sum of squared error for HDR to avoid light
// channels dominating the error calculations.
// See https://fgiesen.wordpress.com/2024/11/14/mrsse/
if (any_lns)
{
// TODO: Divisor could be precomputed at load time
error = error / (dot(oldColor, oldColor) + 1e-10f);
}

summa += min(error, ERROR_CALC_DEFAULT);
}

return summa.lane<0>();
Expand Down Expand Up @@ -451,6 +461,8 @@ float compute_symbolic_block_difference_1plane(
rgb_lns, a_lns,
ep0, ep1);

bool any_lns = rgb_lns || a_lns;

// Unpack and compute error for each texel in the partition
unsigned int texel_count = pi.partition_texel_count[i];
for (unsigned int j = 0; j < texel_count; j++)
Expand Down Expand Up @@ -492,11 +504,20 @@ float compute_symbolic_block_difference_1plane(
);
}

vfloat4 error = oldColor - color;
error = min(abs(error), 1e15f);
error = error * error;
// Compute sum of squared errors, weighted by channel weight
vfloat4 error = (oldColor - color);
error = dot(error, error * blk.channel_weight);

// Convert this relative sum of squared error for HDR to avoid light
// channels dominating the error calculations
// See https://fgiesen.wordpress.com/2024/11/14/mrsse/
if (any_lns)
{
// TODO: Divisor could be precomputed at load time
error = error / (dot(oldColor, oldColor) + 1e-10f);
}

summa += min(dot(error, blk.channel_weight), ERROR_CALC_DEFAULT);
summa += min(error, ERROR_CALC_DEFAULT);
}
}

Expand Down
Loading