From 7e7441749b7b9250776a9c2ea81aa55c1e8f1f26 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Mon, 10 Sep 2018 12:35:25 +0200 Subject: [PATCH 1/3] Fix the remaining LUMINANCE* cases in rgba8_image_to_tex_image_data --- .../script/dom/webglrenderingcontext.rs | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index d227af7ea1a..d6e255bcbd0 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -4126,8 +4126,8 @@ fn rgba8_image_to_tex_image_data( (TexFormat::Luminance, TexDataType::Float) => { for rgba8 in pixels.chunks_mut(4) { - let p = luminance(rgba8[0], rgba8[1], rgba8[2]); - NativeEndian::write_f32(rgba8, p as f32); + let p = rgba8[0] as f32; + NativeEndian::write_f32(rgba8, p); } pixels }, @@ -4135,8 +4135,7 @@ fn rgba8_image_to_tex_image_data( (TexFormat::LuminanceAlpha, TexDataType::Float) => { let mut data = Vec::::with_capacity(pixel_count * 8); for rgba8 in pixels.chunks(4) { - let p = luminance(rgba8[0], rgba8[1], rgba8[2]); - data.write_f32::(p as f32).unwrap(); + data.write_f32::(rgba8[0] as f32).unwrap(); data.write_f32::(rgba8[3] as f32).unwrap(); } data @@ -4172,10 +4171,7 @@ fn rgba8_image_to_tex_image_data( }, (TexFormat::Luminance, TexDataType::HalfFloat) => { for i in 0..pixel_count { - let p = { - let rgb = &pixels[i * 4..i * 4 + 3]; - f16::from_f32(luminance(rgb[0], rgb[1], rgb[2]) as f32).as_bits() - }; + let p = f16::from_f32(pixels[i * 4] as f32).as_bits(); NativeEndian::write_u16(&mut pixels[i * 2..i * 2 + 2], p); } pixels.truncate(pixel_count * 2); @@ -4184,8 +4180,7 @@ fn rgba8_image_to_tex_image_data( (TexFormat::LuminanceAlpha, TexDataType::HalfFloat) => { let mut data = Vec::::with_capacity(pixel_count * 8); for rgba8 in pixels.chunks(4) { - let p = luminance(rgba8[0], rgba8[1], rgba8[2]); - data.write_u16::(f16::from_f32(p as f32).as_bits()).unwrap(); + data.write_u16::(f16::from_f32(rgba8[0] as f32).as_bits()).unwrap(); data.write_u16::(f16::from_f32(rgba8[3] as f32).as_bits()).unwrap(); } data @@ -4197,11 +4192,3 @@ fn rgba8_image_to_tex_image_data( _ => unreachable!("Unsupported formats {:?} {:?}", format, data_type) } } - -// https://en.wikipedia.org/wiki/Relative_luminance -#[inline] -fn luminance(r: u8, g: u8, b: u8) -> u8 { - (0.2126 * (r as f32) + - 0.7152 * (g as f32) + - 0.0722 * (b as f32)) as u8 -} From e1486f7d711f8d6f9a11c7ba863465a6a8e91938 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Mon, 10 Sep 2018 12:43:38 +0200 Subject: [PATCH 2/3] Reuse input vector for LUMINANCE_ALPHA/HALF_FLOAT --- components/script/dom/webglrenderingcontext.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index d6e255bcbd0..9b99f598d51 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -4178,12 +4178,13 @@ fn rgba8_image_to_tex_image_data( pixels }, (TexFormat::LuminanceAlpha, TexDataType::HalfFloat) => { - let mut data = Vec::::with_capacity(pixel_count * 8); - for rgba8 in pixels.chunks(4) { - data.write_u16::(f16::from_f32(rgba8[0] as f32).as_bits()).unwrap(); - data.write_u16::(f16::from_f32(rgba8[3] as f32).as_bits()).unwrap(); + for rgba8 in pixels.chunks_mut(4) { + let lum = f16::from_f32(rgba8[0] as f32).as_bits(); + let a = f16::from_f32(rgba8[3] as f32).as_bits(); + NativeEndian::write_u16(&mut rgba8[0..2], lum); + NativeEndian::write_u16(&mut rgba8[2..4], a); } - data + pixels }, // Validation should have ensured that we only hit the From dac7740b8c1be31c1457dbc48ad26baaa1bb8ed7 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Mon, 10 Sep 2018 12:55:57 +0200 Subject: [PATCH 3/3] Reuse input buffer for RGB/UNSIGNED_BYTE in rgba8_image_to_tex_image_data --- components/script/dom/webglrenderingcontext.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 9b99f598d51..ab7178ffa16 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -4017,14 +4017,15 @@ fn rgba8_image_to_tex_image_data( match (format, data_type) { (TexFormat::RGBA, TexDataType::UnsignedByte) => pixels, (TexFormat::RGB, TexDataType::UnsignedByte) => { - // Remove alpha channel - let mut rgb8 = Vec::::with_capacity(pixel_count * 3); - for rgba8 in pixels.chunks(4) { - rgb8.push(rgba8[0]); - rgb8.push(rgba8[1]); - rgb8.push(rgba8[2]); + for i in 0..pixel_count { + let rgb = { + let rgb = &pixels[i * 4..i * 4 + 3]; + [rgb[0], rgb[1], rgb[2]] + }; + pixels[i * 3..i * 3 + 3].copy_from_slice(&rgb); } - rgb8 + pixels.truncate(pixel_count * 3); + pixels }, (TexFormat::Alpha, TexDataType::UnsignedByte) => { for i in 0..pixel_count {