me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switched to packing using f16s to maintain acceptable precision.

Browse source
This commit is contained in:
Bingus 2023-06-07 10:47:57 -07:00
parent 9554c78f3a
commit 677f564f08
No known key found for this signature in database
GPG key ID: 5F84D2AA40A9F170
7 changed files with 160 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

1
graphics/Cargo.toml
View file

@ -18,6 +18,7 @@ web-colors = []
[dependencies]
glam = "0.24"
half = "2.2.1"
log = "0.4"
raw-window-handle = "0.5"
thiserror = "1.0"

76
graphics/src/gradient.rs
View file

@ -7,6 +7,7 @@ use crate::color;
use crate::core::gradient::ColorStop;
use crate::core::{self, Color, Point, Rectangle};
use half::f16;
use std::cmp::Ordering;
#[derive(Debug, Clone, PartialEq)]
@ -99,24 +100,30 @@ impl Linear {
/// Packs the [`Gradient`] for use in shader code.
pub fn pack(&self) -> Packed {
let mut colors = [0u32; 8];
let mut offsets = [0.0f32; 8];
let mut colors = [[0u32; 2]; 8];
let mut offsets = [f16::from(0u8); 8];
for (index, stop) in self.stops.iter().enumerate() {
let (color, offset) =
stop.map_or((Color::default(), 2.0), |s| (s.color, s.offset));
let [r, g, b, a] =
color::pack(stop.map_or(Color::default(), |s| s.color))
.components();
if color::GAMMA_CORRECTION {
//correct colors, convert to linear before uploading to GPU
colors[index] = color.into_linear_u32();
} else {
//web colors, don't convert to linear before uploading to GPU
colors[index] = color.into_u32();
}
colors[index] = [
pack_f16s([f16::from_f32(r), f16::from_f32(g)]),
pack_f16s([f16::from_f32(b), f16::from_f32(a)]),
];
offsets[index] = offset;
offsets[index] =
stop.map_or(f16::from_f32(2.0), |s| f16::from_f32(s.offset));
}
let offsets = [
pack_f16s([offsets[0], offsets[1]]),
pack_f16s([offsets[2], offsets[3]]),
pack_f16s([offsets[4], offsets[5]]),
pack_f16s([offsets[6], offsets[7]]),
];
let direction = [self.start.x, self.start.y, self.end.x, self.end.y];
Packed {
@ -131,9 +138,10 @@ impl Linear {
#[derive(Debug, Copy, Clone, PartialEq)]
#[repr(C)]
pub struct Packed {
// 8 colors, each packed into a u32
colors: [u32; 8],
offsets: [f32; 8],
// 8 colors, each channel = 16 bit float, 2 colors packed into 1 u32
colors: [[u32; 2]; 8],
// 8 offsets, 8x 16 bit floats packed into 4 u32s
offsets: [u32; 4],
direction: [f32; 4],
}
@ -141,24 +149,30 @@ pub struct Packed {
pub fn pack(gradient: &core::Gradient, bounds: Rectangle) -> Packed {
match gradient {
core::Gradient::Linear(linear) => {
let mut colors = [0u32; 8];
let mut offsets = [0.0f32; 8];
let mut colors = [[0u32; 2]; 8];
let mut offsets = [f16::from(0u8); 8];
for (index, stop) in linear.stops.iter().enumerate() {
let (color, offset) = stop
.map_or((Color::default(), 2.0), |s| (s.color, s.offset));
let [r, g, b, a] =
color::pack(stop.map_or(Color::default(), |s| s.color))
.components();
if color::GAMMA_CORRECTION {
//correct colors, convert to linear before uploading to GPU
colors[index] = color.into_linear_u32();
} else {
//web colors, don't convert to linear before uploading to GPU
colors[index] = color.into_u32();
}
colors[index] = [
pack_f16s([f16::from_f32(r), f16::from_f32(g)]),
pack_f16s([f16::from_f32(b), f16::from_f32(a)]),
];
offsets[index] = offset;
offsets[index] = stop
.map_or(f16::from_f32(2.0), |s| f16::from_f32(s.offset));
}
let offsets = [
pack_f16s([offsets[0], offsets[1]]),
pack_f16s([offsets[2], offsets[3]]),
pack_f16s([offsets[4], offsets[5]]),
pack_f16s([offsets[6], offsets[7]]),
];
let (start, end) = linear.angle.to_distance(&bounds);
let direction = [start.x, start.y, end.x, end.y];
@ -171,3 +185,11 @@ pub fn pack(gradient: &core::Gradient, bounds: Rectangle) -> Packed {
}
}
}
/// Packs two f16s into one u32.
fn pack_f16s(f: [f16; 2]) -> u32 {
let one = (f[0].to_bits() as u32) << 16;
let two = f[1].to_bits() as u32;
one | two
}