wtemple/ruin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge origin/main into macos

Browse Source 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Will Temple
2026-05-16 16:38:10 -04:00
parent 23d9f02e3a 6dcc2d0d00
commit ccc3984b01
66 changed files with 9558 additions and 2326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/ui_renderer_wgpu/src/lib.rs
View File

@@ -333,6 +333,7 @@ pub struct WgpuSceneRenderer {
#[allow(dead_code)]
glyph_atlas: GlyphAtlas,
scale_factor: f32,
base_color: Color,
}
const MAX_TEXT_CACHE_ENTRIES: usize = 64;
@@ -346,6 +347,7 @@ impl WgpuSceneRenderer {
target: impl HasDisplayHandle + HasWindowHandle + Send + Sync + 'static,
width: u32,
height: u32,
base_color: Color,
) -> Result<Self, Box<dyn Error>> {
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor::new_without_display_handle());
let surface = instance.create_surface(target)?;
@@ -364,6 +366,15 @@ impl WgpuSceneRenderer {
.copied()
.find(wgpu::TextureFormat::is_srgb)
.unwrap_or(caps.formats[0]);
let alpha_mode = if base_color.a < 255
&& caps
.alpha_modes
.contains(&wgpu::CompositeAlphaMode::PreMultiplied)
{
wgpu::CompositeAlphaMode::PreMultiplied
} else {
caps.alpha_modes[0]
};
let config = wgpu::SurfaceConfiguration {
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
format,
@@ -374,7 +385,7 @@ impl WgpuSceneRenderer {
// power-conservative policy once presentation settings are exposed.
present_mode: wgpu::PresentMode::AutoNoVsync,
desired_maximum_frame_latency: 1,
alpha_mode: caps.alpha_modes[0],
alpha_mode,
view_formats: vec![],
};
surface.configure(&device, &config);
@@ -421,7 +432,7 @@ fn sd_round_rect(point: vec2<f32>, rect: vec4<f32>, radius: f32) -> f32 {
fn rounded_rect_alpha(point: vec2<f32>, rect: vec4<f32>, radius: f32) -> f32 {
let distance = sd_round_rect(point, rect, radius);
return 1.0 - smoothstep(0.0, 1.0, distance);
return 1.0 - smoothstep(-0.5, 0.5, distance);
}
fn blurred_round_rect_alpha(point: vec2<f32>, rect: vec4<f32>, radius: f32, blur: f32) -> f32 {
@@ -559,7 +570,7 @@ fn sd_round_rect(point: vec2<f32>, rect: vec4<f32>, radius: f32) -> f32 {
fn rounded_rect_alpha(point: vec2<f32>, rect: vec4<f32>, radius: f32) -> f32 {
let distance = sd_round_rect(point, rect, radius);
return 1.0 - smoothstep(0.0, 1.0, distance);
return 1.0 - smoothstep(-0.5, 0.5, distance);
}
fn apply_clip_alpha(point: vec2<f32>, clip_rect: vec4<f32>, rounded_clip_rect: vec4<f32>, clip_params: vec2<f32>) -> f32 {
@@ -717,6 +728,7 @@ fn fs_main(input: VertexOut) -> @location(0) vec4<f32> {
image_cache_order: VecDeque::new(),
glyph_atlas,
scale_factor: 1.0,
base_color,
})
}
@@ -824,11 +836,16 @@ fn fs_main(input: VertexOut) -> @location(0) vec4<f32> {
depth_slice: None,
resolve_target: None,
ops: wgpu::Operations {
load: wgpu::LoadOp::Clear(wgpu::Color {
r: 0.03,
g: 0.04,
b: 0.08,
a: 1.0,
load: wgpu::LoadOp::Clear({
let a = self.base_color.a as f64 / 255.0;
// Premultiplied: multiply RGB by alpha so the compositor
// can blend correctly when alpha_mode is PreMultiplied.
wgpu::Color {
r: (self.base_color.r as f64 / 255.0) * a,
g: (self.base_color.g as f64 / 255.0) * a,
b: (self.base_color.b as f64 / 255.0) * a,
a,
}
}),
store: wgpu::StoreOp::Store,
},