Skip to content

Sync changes from mozilla-central gfx/qcms #38

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

Open
moz-gfx wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Sync changes from mozilla-central gfx/qcms #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1f02cc
Bug 1884279 - compute_precache always returns true so drop the return…
jrmuizel Mar 9, 2024
0b04075
Bug 1884381 - Use a single allocation for precache_output. r=gfx-revi…
jrmuizel Mar 11, 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
4 changes: 1 addition & 3 deletions src/iccread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ pub struct Profile {
pub(crate) mAB: Option<Box<lutmABType>>,
pub(crate) mBA: Option<Box<lutmABType>>,
pub(crate) chromaticAdaption: Option<Matrix>,
pub(crate) output_table_r: Option<Arc<PrecacheOuput>>,
pub(crate) output_table_g: Option<Arc<PrecacheOuput>>,
pub(crate) output_table_b: Option<Arc<PrecacheOuput>>,
pub(crate) precache_output: Option<Arc<PrecacheOuput>>,
is_srgb: bool,
}

Expand Down
83 changes: 35 additions & 48 deletions src/transform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,17 @@ pub struct PrecacheOuput {
* improve startup performance and reduce memory usage. ColorSync on
* 10.5 uses 4097 which is perhaps because they use a fixed point
* representation where 1. is represented by 0x1000. */
pub data: [u8; PRECACHE_OUTPUT_SIZE],
pub lut_r: [u8; PRECACHE_OUTPUT_SIZE],
pub lut_g: [u8; PRECACHE_OUTPUT_SIZE],
pub lut_b: [u8; PRECACHE_OUTPUT_SIZE],
}

impl Default for PrecacheOuput {
fn default() -> PrecacheOuput {
PrecacheOuput {
data: [0; PRECACHE_OUTPUT_SIZE],
lut_r: [0; PRECACHE_OUTPUT_SIZE],
lut_g: [0; PRECACHE_OUTPUT_SIZE],
lut_b: [0; PRECACHE_OUTPUT_SIZE],
}
}
}
Expand Down Expand Up @@ -113,9 +117,7 @@ pub struct qcms_transform {
pub output_gamma_lut_g_length: usize,
pub output_gamma_lut_b_length: usize,
pub output_gamma_lut_gray_length: usize,
pub output_table_r: Option<Arc<PrecacheOuput>>,
pub output_table_g: Option<Arc<PrecacheOuput>>,
pub output_table_b: Option<Arc<PrecacheOuput>>,
pub precache_output: Option<Arc<PrecacheOuput>>,
pub transform_fn: transform_fn_t,
}

Expand Down Expand Up @@ -481,9 +483,10 @@ unsafe fn qcms_transform_data_gray_template_precache<I: GrayFormat, F: Format>(
length: usize,
) {
let components: u32 = if F::kAIndex == 0xff { 3 } else { 4 } as u32;
let output_table_r = transform.output_table_r.as_deref().unwrap();
let output_table_g = transform.output_table_g.as_deref().unwrap();
let output_table_b = transform.output_table_b.as_deref().unwrap();
let precache_output = transform.precache_output.as_deref().unwrap();
let output_r = &precache_output.lut_r;
let output_g = &precache_output.lut_g;
let output_b = &precache_output.lut_b;

let input_gamma_table_gray = transform
.input_gamma_table_gray
Expand All @@ -506,9 +509,9 @@ unsafe fn qcms_transform_data_gray_template_precache<I: GrayFormat, F: Format>(
let linear: f32 = *input_gamma_table_gray.offset(device as isize);
/* we could round here... */
let gray: u16 = (linear * PRECACHE_OUTPUT_MAX as f32) as u16;
*dest.add(F::kRIndex) = (output_table_r).data[gray as usize];
*dest.add(F::kGIndex) = (output_table_g).data[gray as usize];
*dest.add(F::kBIndex) = (output_table_b).data[gray as usize];
*dest.add(F::kRIndex) = output_r[gray as usize];
*dest.add(F::kGIndex) = output_g[gray as usize];
*dest.add(F::kBIndex) = output_b[gray as usize];
if F::kAIndex != 0xff {
*dest.add(F::kAIndex) = alpha
}
Expand Down Expand Up @@ -563,9 +566,9 @@ unsafe fn qcms_transform_data_template_lut_precache<F: Format>(
length: usize,
) {
let components: u32 = if F::kAIndex == 0xff { 3 } else { 4 } as u32;
let output_table_r = transform.output_table_r.as_deref().unwrap();
let output_table_g = transform.output_table_g.as_deref().unwrap();
let output_table_b = transform.output_table_b.as_deref().unwrap();
let output_table_r = &transform.precache_output.as_deref().unwrap().lut_r;
let output_table_g = &transform.precache_output.as_deref().unwrap().lut_g;
let output_table_b = &transform.precache_output.as_deref().unwrap().lut_b;
let input_gamma_table_r = transform.input_gamma_table_r.as_ref().unwrap().as_ptr();
let input_gamma_table_g = transform.input_gamma_table_g.as_ref().unwrap().as_ptr();
let input_gamma_table_b = transform.input_gamma_table_b.as_ref().unwrap().as_ptr();
Expand Down Expand Up @@ -596,9 +599,9 @@ unsafe fn qcms_transform_data_template_lut_precache<F: Format>(
let r: u16 = (out_linear_r * PRECACHE_OUTPUT_MAX as f32) as u16;
let g: u16 = (out_linear_g * PRECACHE_OUTPUT_MAX as f32) as u16;
let b: u16 = (out_linear_b * PRECACHE_OUTPUT_MAX as f32) as u16;
*dest.add(F::kRIndex) = (output_table_r).data[r as usize];
*dest.add(F::kGIndex) = (output_table_g).data[g as usize];
*dest.add(F::kBIndex) = (output_table_b).data[b as usize];
*dest.add(F::kRIndex) = output_table_r[r as usize];
*dest.add(F::kGIndex) = output_table_g[g as usize];
*dest.add(F::kBIndex) = output_table_b[b as usize];
if F::kAIndex != 0xff {
*dest.add(F::kAIndex) = alpha
}
Expand Down Expand Up @@ -1172,33 +1175,22 @@ pub extern "C" fn qcms_profile_precache_output_transform(profile: &mut Profile)
if profile.redTRC.is_none() || profile.greenTRC.is_none() || profile.blueTRC.is_none() {
return;
}
if profile.output_table_r.is_none() {
let mut output_table_r = precache_create();
if compute_precache(
if profile.precache_output.is_none() {
let mut precache = precache_create();
compute_precache(
profile.redTRC.as_deref().unwrap(),
&mut Arc::get_mut(&mut output_table_r).unwrap().data,
) {
profile.output_table_r = Some(output_table_r);
}
}
if profile.output_table_g.is_none() {
let mut output_table_g = precache_create();
if compute_precache(
&mut Arc::get_mut(&mut precache).unwrap().lut_r,
);
compute_precache(
profile.greenTRC.as_deref().unwrap(),
&mut Arc::get_mut(&mut output_table_g).unwrap().data,
) {
profile.output_table_g = Some(output_table_g);
}
}
if profile.output_table_b.is_none() {
let mut output_table_b = precache_create();
if compute_precache(
&mut Arc::get_mut(&mut precache).unwrap().lut_g,
);
compute_precache(
profile.blueTRC.as_deref().unwrap(),
&mut Arc::get_mut(&mut output_table_b).unwrap().data,
) {
profile.output_table_b = Some(output_table_b);
}
};
&mut Arc::get_mut(&mut precache).unwrap().lut_b,
);
profile.precache_output = Some(precache);
}
}
/* Replace the current transformation with a LUT transformation using a given number of sample points */
fn transform_precacheLUT_float(
Expand Down Expand Up @@ -1303,10 +1295,7 @@ pub fn transform_create(
}
let mut transform: Box<qcms_transform> = Box::new(Default::default());
let mut precache: bool = false;
if output.output_table_r.is_some()
&& output.output_table_g.is_some()
&& output.output_table_b.is_some()
{
if output.precache_output.is_some() {
precache = true
}
// This precache assumes RGB_SIGNATURE (fails on GRAY_SIGNATURE, for instance)
Expand All @@ -1330,9 +1319,7 @@ pub fn transform_create(
return result;
}
if precache {
transform.output_table_r = Some(Arc::clone(output.output_table_r.as_ref().unwrap()));
transform.output_table_g = Some(Arc::clone(output.output_table_g.as_ref().unwrap()));
transform.output_table_b = Some(Arc::clone(output.output_table_b.as_ref().unwrap()));
transform.precache_output = Some(Arc::clone(output.precache_output.as_ref().unwrap()));
} else {
if output.redTRC.is_none() || output.greenTRC.is_none() || output.blueTRC.is_none() {
return None;
Expand Down
12 changes: 6 additions & 6 deletions src/transform_avx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,22 @@ unsafe extern "C" fn qcms_transform_data_template_lut_avx<F: Format>(
let igtbl_b: *const f32 = transform.input_gamma_table_b.as_ref().unwrap().as_ptr();
/* deref *transform now to avoid it in loop */
let otdata_r: *const u8 = transform
.output_table_r
.precache_output
.as_deref()
.unwrap()
.data
.lut_r
.as_ptr();
let otdata_g: *const u8 = (*transform)
.output_table_g
.precache_output
.as_deref()
.unwrap()
.data
.lut_g
.as_ptr();
let otdata_b: *const u8 = (*transform)
.output_table_b
.precache_output
.as_deref()
.unwrap()
.data
.lut_b
.as_ptr();
/* input matrix values never change */
let mat0: __m256 = _mm256_broadcast_ps(&*((*mat.offset(0isize)).as_ptr() as *const __m128));
Expand Down
14 changes: 7 additions & 7 deletions src/transform_neon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,23 @@ unsafe fn qcms_transform_data_template_lut_neon<F: Format>(
let igtbl_g: *const f32 = (*transform).input_gamma_table_g.as_ref().unwrap().as_ptr();
let igtbl_b: *const f32 = (*transform).input_gamma_table_b.as_ref().unwrap().as_ptr();
/* deref *transform now to avoid it in loop */
let otdata_r: *const u8 = (*transform)
.output_table_r
let otdata_r: *const u8 = transform
.precache_output
.as_deref()
.unwrap()
.data
.lut_r
.as_ptr();
let otdata_g: *const u8 = (*transform)
.output_table_g
.precache_output
.as_deref()
.unwrap()
.data
.lut_g
.as_ptr();
let otdata_b: *const u8 = (*transform)
.output_table_b
.precache_output
.as_deref()
.unwrap()
.data
.lut_b
.as_ptr();
/* input matrix values never change */
let mat0: float32x4_t = vld1q_f32((*mat.offset(0isize)).as_ptr());
Expand Down
12 changes: 6 additions & 6 deletions src/transform_sse2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@ unsafe extern "C" fn qcms_transform_data_template_lut_sse2<F: Format>(
let igtbl_b: *const f32 = (*transform).input_gamma_table_b.as_ref().unwrap().as_ptr();
/* deref *transform now to avoid it in loop */
let otdata_r: *const u8 = (*transform)
.output_table_r
.precache_output
.as_deref()
.unwrap()
.data
.lut_r
.as_ptr();
let otdata_g: *const u8 = (*transform)
.output_table_g
.precache_output
.as_deref()
.unwrap()
.data
.lut_g
.as_ptr();
let otdata_b: *const u8 = (*transform)
.output_table_b
.precache_output
.as_deref()
.unwrap()
.data
.lut_b
.as_ptr();
/* input matrix values never change */
let mat0: __m128 = _mm_load_ps((*mat.offset(0isize)).as_ptr());
Expand Down
3 changes: 1 addition & 2 deletions src/transform_util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ pub fn compute_precache_linear(output: &mut [u8; PRECACHE_OUTPUT_SIZE]) {
output[v] = (v / (PRECACHE_OUTPUT_SIZE / 256)) as u8;
}
}
pub(crate) fn compute_precache(trc: &curveType, output: &mut [u8; PRECACHE_OUTPUT_SIZE]) -> bool {
pub(crate) fn compute_precache(trc: &curveType, output: &mut [u8; PRECACHE_OUTPUT_SIZE]) {
match trc {
curveType::Parametric(params) => {
let mut gamma_table_uint: [u16; 256] = [0; 256];
Expand Down Expand Up @@ -512,7 +512,6 @@ pub(crate) fn compute_precache(trc: &curveType, output: &mut [u8; PRECACHE_OUTPU
}
}
}
true
}
fn build_linear_table(length: usize) -> Vec<u16> {
let mut output = Vec::with_capacity(length);
Expand Down