mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
pixels: Move Snapshot
and related data structures to pixels
(#37590)
1. The `shared` directory is for the "_traits" crates, which will likely be moved out of this directly at some point and renamed "_api". These crates expose the API of crates to avoid circular dependencies. `Snapshot` isn't really this. 2. `Snapshot` is essentially a specialied kind of `Image` so it makes sense that it is grouped with other image-related things in `pixels`. Testing: This should not change any behavior so is covered by existing tests. Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
parent
80a7de8c9c
commit
309485d2db
32 changed files with 123 additions and 154 deletions
305
components/pixels/snapshot.rs
Normal file
305
components/pixels/snapshot.rs
Normal file
|
@ -0,0 +1,305 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use std::ops::{Deref, DerefMut};
|
||||
|
||||
use euclid::default::Size2D;
|
||||
use ipc_channel::ipc::IpcSharedMemory;
|
||||
use malloc_size_of_derive::MallocSizeOf;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::{Multiply, transform_inplace};
|
||||
|
||||
#[derive(Clone, Copy, Debug, Default, Deserialize, Eq, MallocSizeOf, PartialEq, Serialize)]
|
||||
pub enum SnapshotPixelFormat {
|
||||
#[default]
|
||||
RGBA,
|
||||
BGRA,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, Deserialize, Eq, MallocSizeOf, PartialEq, Serialize)]
|
||||
pub enum SnapshotAlphaMode {
|
||||
/// Internal data is opaque (alpha is cleared to 1)
|
||||
Opaque,
|
||||
/// Internal data should be threated as opaque (does not mean it actually is)
|
||||
AsOpaque { premultiplied: bool },
|
||||
/// Data is not opaque
|
||||
Transparent { premultiplied: bool },
|
||||
}
|
||||
|
||||
impl Default for SnapshotAlphaMode {
|
||||
fn default() -> Self {
|
||||
Self::Transparent {
|
||||
premultiplied: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl SnapshotAlphaMode {
|
||||
pub const fn is_premultiplied(&self) -> bool {
|
||||
match self {
|
||||
SnapshotAlphaMode::Opaque => true,
|
||||
SnapshotAlphaMode::AsOpaque { premultiplied } => *premultiplied,
|
||||
SnapshotAlphaMode::Transparent { premultiplied } => *premultiplied,
|
||||
}
|
||||
}
|
||||
|
||||
pub const fn is_opaque(&self) -> bool {
|
||||
matches!(
|
||||
self,
|
||||
SnapshotAlphaMode::Opaque | SnapshotAlphaMode::AsOpaque { .. }
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
|
||||
pub enum SnapshotData {
|
||||
// TODO: https://github.com/servo/servo/issues/36594
|
||||
//IPC(IpcSharedMemory),
|
||||
Owned(Vec<u8>),
|
||||
}
|
||||
|
||||
impl Deref for SnapshotData {
|
||||
type Target = [u8];
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
match &self {
|
||||
//Data::IPC(ipc_shared_memory) => ipc_shared_memory,
|
||||
SnapshotData::Owned(items) => items,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl DerefMut for SnapshotData {
|
||||
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||
match self {
|
||||
//Data::IPC(ipc_shared_memory) => unsafe { ipc_shared_memory.deref_mut() },
|
||||
SnapshotData::Owned(items) => items,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub type IpcSnapshot = Snapshot<IpcSharedMemory>;
|
||||
|
||||
/// Represents image bitmap with metadata, usually as snapshot of canvas
|
||||
///
|
||||
/// This allows us to hold off conversions (BGRA <-> RGBA, (un)premultiply)
|
||||
/// to when/if they are actually needed (WebGL/WebGPU can load both BGRA and RGBA).
|
||||
///
|
||||
/// Inspired by snapshot for concept in WebGPU spec:
|
||||
/// <https://gpuweb.github.io/gpuweb/#abstract-opdef-get-a-copy-of-the-image-contents-of-a-context>
|
||||
#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
|
||||
pub struct Snapshot<T = SnapshotData> {
|
||||
size: Size2D<u32>,
|
||||
/// internal data (can be any format it will be converted on use if needed)
|
||||
data: T,
|
||||
/// RGBA/BGRA (reflect internal data)
|
||||
format: SnapshotPixelFormat,
|
||||
/// How to treat alpha channel
|
||||
alpha_mode: SnapshotAlphaMode,
|
||||
}
|
||||
|
||||
impl<T> Snapshot<T> {
|
||||
pub const fn size(&self) -> Size2D<u32> {
|
||||
self.size
|
||||
}
|
||||
|
||||
pub const fn format(&self) -> SnapshotPixelFormat {
|
||||
self.format
|
||||
}
|
||||
|
||||
pub const fn alpha_mode(&self) -> SnapshotAlphaMode {
|
||||
self.alpha_mode
|
||||
}
|
||||
|
||||
pub const fn is_premultiplied(&self) -> bool {
|
||||
self.alpha_mode().is_premultiplied()
|
||||
}
|
||||
|
||||
pub const fn is_opaque(&self) -> bool {
|
||||
self.alpha_mode().is_opaque()
|
||||
}
|
||||
}
|
||||
|
||||
impl Snapshot<SnapshotData> {
|
||||
pub fn empty() -> Self {
|
||||
Self {
|
||||
size: Size2D::zero(),
|
||||
data: SnapshotData::Owned(vec![]),
|
||||
format: SnapshotPixelFormat::RGBA,
|
||||
alpha_mode: SnapshotAlphaMode::Transparent {
|
||||
premultiplied: true,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns snapshot with provided size that is black transparent alpha
|
||||
pub fn cleared(size: Size2D<u32>) -> Self {
|
||||
Self {
|
||||
size,
|
||||
data: SnapshotData::Owned(vec![0; size.area() as usize * 4]),
|
||||
format: SnapshotPixelFormat::RGBA,
|
||||
alpha_mode: SnapshotAlphaMode::Transparent {
|
||||
premultiplied: true,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_vec(
|
||||
size: Size2D<u32>,
|
||||
format: SnapshotPixelFormat,
|
||||
alpha_mode: SnapshotAlphaMode,
|
||||
data: Vec<u8>,
|
||||
) -> Self {
|
||||
Self {
|
||||
size,
|
||||
data: SnapshotData::Owned(data),
|
||||
format,
|
||||
alpha_mode,
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: https://github.com/servo/servo/issues/36594
|
||||
/*
|
||||
/// # Safety
|
||||
///
|
||||
/// This is safe if data is owned by this process only
|
||||
/// (ownership is transferred on send)
|
||||
pub unsafe fn from_shared_memory(
|
||||
size: Size2D<u32>,
|
||||
format: PixelFormat,
|
||||
alpha_mode: AlphaMode,
|
||||
ism: IpcSharedMemory,
|
||||
) -> Self {
|
||||
Self {
|
||||
size,
|
||||
data: Data::IPC(ism),
|
||||
format,
|
||||
alpha_mode,
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
pub fn data(&self) -> &[u8] {
|
||||
&self.data
|
||||
}
|
||||
|
||||
pub fn data_mut(&mut self) -> &mut [u8] {
|
||||
&mut self.data
|
||||
}
|
||||
|
||||
/// Convert inner data of snapshot to target format and alpha mode.
|
||||
/// If data is already in target format and alpha mode no work will be done.
|
||||
pub fn transform(
|
||||
&mut self,
|
||||
target_alpha_mode: SnapshotAlphaMode,
|
||||
target_format: SnapshotPixelFormat,
|
||||
) {
|
||||
let swap_rb = target_format != self.format;
|
||||
let multiply = match (self.alpha_mode, target_alpha_mode) {
|
||||
(SnapshotAlphaMode::Opaque, _) => Multiply::None,
|
||||
(alpha_mode, SnapshotAlphaMode::Opaque) => {
|
||||
if alpha_mode.is_premultiplied() {
|
||||
Multiply::UnMultiply
|
||||
} else {
|
||||
Multiply::None
|
||||
}
|
||||
},
|
||||
(
|
||||
SnapshotAlphaMode::Transparent { premultiplied } |
|
||||
SnapshotAlphaMode::AsOpaque { premultiplied },
|
||||
SnapshotAlphaMode::Transparent {
|
||||
premultiplied: target_premultiplied,
|
||||
} |
|
||||
SnapshotAlphaMode::AsOpaque {
|
||||
premultiplied: target_premultiplied,
|
||||
},
|
||||
) => {
|
||||
if premultiplied == target_premultiplied {
|
||||
Multiply::None
|
||||
} else if target_premultiplied {
|
||||
Multiply::PreMultiply
|
||||
} else {
|
||||
Multiply::UnMultiply
|
||||
}
|
||||
},
|
||||
};
|
||||
let clear_alpha = !matches!(self.alpha_mode, SnapshotAlphaMode::Opaque) &&
|
||||
matches!(target_alpha_mode, SnapshotAlphaMode::Opaque);
|
||||
transform_inplace(self.data.deref_mut(), multiply, swap_rb, clear_alpha);
|
||||
self.alpha_mode = target_alpha_mode;
|
||||
self.format = target_format;
|
||||
}
|
||||
|
||||
pub fn as_ipc(self) -> Snapshot<IpcSharedMemory> {
|
||||
let Snapshot {
|
||||
size,
|
||||
data,
|
||||
format,
|
||||
alpha_mode,
|
||||
} = self;
|
||||
let data = match data {
|
||||
//Data::IPC(ipc_shared_memory) => ipc_shared_memory,
|
||||
SnapshotData::Owned(items) => IpcSharedMemory::from_bytes(&items),
|
||||
};
|
||||
Snapshot {
|
||||
size,
|
||||
data,
|
||||
format,
|
||||
alpha_mode,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn to_vec(self) -> Vec<u8> {
|
||||
match self.data {
|
||||
SnapshotData::Owned(data) => data,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Snapshot<IpcSharedMemory> {
|
||||
// TODO: https://github.com/servo/servo/issues/36594
|
||||
/*
|
||||
/// # Safety
|
||||
///
|
||||
/// This is safe if data is owned by this process only
|
||||
/// (ownership is transferred on send)
|
||||
pub unsafe fn to_data(self) -> Snapshot<Data> {
|
||||
let Snapshot {
|
||||
size,
|
||||
data,
|
||||
format,
|
||||
alpha_mode,
|
||||
} = self;
|
||||
Snapshot {
|
||||
size,
|
||||
data: Data::IPC(data),
|
||||
format,
|
||||
alpha_mode,
|
||||
}
|
||||
}
|
||||
*/
|
||||
pub fn to_owned(self) -> Snapshot<SnapshotData> {
|
||||
let Snapshot {
|
||||
size,
|
||||
data,
|
||||
format,
|
||||
alpha_mode,
|
||||
} = self;
|
||||
Snapshot {
|
||||
size,
|
||||
data: SnapshotData::Owned(data.to_vec()),
|
||||
format,
|
||||
alpha_mode,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn data(&self) -> &[u8] {
|
||||
&self.data
|
||||
}
|
||||
|
||||
pub fn to_ipc_shared_memory(self) -> IpcSharedMemory {
|
||||
self.data
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue