Skip to content

windows: Clip rounded retained layers #6

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

Merged
BumpyClock merged 1 commit into from
Jul 15, 2026
+109 −2
Merged

windows: Clip rounded retained layers #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
69 changes: 68 additions & 1 deletion crates/gpui_windows/src/directx_renderer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,24 @@ fn retained_layer_state(layer: &gpui::RetainedLayer, order: usize) -> RetainedLa
}
}

fn retained_layer_clip(mask: &ContentMask<ScaledPixels>) -> Option<RetainedLayerClip> {
if mask.corner_radii == Corners::default() {
return None;
}

let bottom_right = mask.rounded_bounds.bottom_right();
Some(RetainedLayerClip {
left: mask.rounded_bounds.origin.x.0,
top: mask.rounded_bounds.origin.y.0,
right: bottom_right.x.0,
bottom: bottom_right.y.0,
top_left_radius: mask.corner_radii.top_left.0,
top_right_radius: mask.corner_radii.top_right.0,
bottom_right_radius: mask.corner_radii.bottom_right.0,
bottom_left_radius: mask.corner_radii.bottom_left.0,
})
}

fn matrix_from_transformation(transform: TransformationMatrix) -> windows_numerics::Matrix3x2 {
windows_numerics::Matrix3x2 {
M11: transform.rotation_scale[0][0],
Expand Down Expand Up @@ -377,6 +395,9 @@ impl DirectXRenderer {
}

direct_composition.enable_retained_layers()?;
direct_composition
.retained_compositor
.set_root_clip(retained_layer_clip(&scene.retained_layers[0].content_mask))?;
let active_layers = Self::retained_layer_ids(scene);
for (order, layer) in scene.retained_layers.iter().enumerate() {
direct_composition.retained_compositor.set_layer(
Expand Down Expand Up @@ -1970,6 +1991,7 @@ impl DirectComposition {
pub fn set_swap_chain(&mut self, swap_chain: &IDXGISwapChain1) -> Result<()> {
unsafe {
self.retained_compositor.retain_layers(&[])?;
self.retained_compositor.set_root_clip(None)?;
self.comp_visual.SetContent(swap_chain)?;
self.comp_target.SetRoot(&self.comp_visual)?;
self.comp_device.Commit()?;
Expand Down Expand Up @@ -1997,6 +2019,7 @@ impl DirectComposition {
}

self.retained_compositor.retain_layers(&[])?;
self.retained_compositor.set_root_clip(None)?;
unsafe {
self.comp_visual.SetContent(swap_chain)?;
self.comp_target.SetRoot(&self.comp_visual)?;
Expand Down Expand Up @@ -3356,7 +3379,11 @@ mod amd {

#[cfg(test)]
mod tests {
use super::{GlobalParams, rounded_backdrop_rebuild_requested};
use gpui::{Bounds, ContentMask, Corners, ScaledPixels, point, size};

use super::{
GlobalParams, RetainedLayerClip, retained_layer_clip, rounded_backdrop_rebuild_requested,
};

#[test]
fn global_params_preserve_hlsl_constant_buffer_alignment() {
Expand All @@ -3369,6 +3396,46 @@ mod tests {
assert!(rounded_backdrop_rebuild_requested(Some(0.0)));
assert!(rounded_backdrop_rebuild_requested(Some(12.0)));
}

#[test]
fn retained_layer_clip_is_disabled_for_rectangular_masks() {
let mask = ContentMask::new(Bounds::new(
point(ScaledPixels(0.0), ScaledPixels(0.0)),
size(ScaledPixels(100.0), ScaledPixels(80.0)),
));

assert_eq!(retained_layer_clip(&mask), None);
}

#[test]
fn retained_layer_clip_preserves_rounded_mask_geometry() {
let mask = ContentMask::rounded(
Bounds::new(
point(ScaledPixels(2.0), ScaledPixels(3.0)),
size(ScaledPixels(100.0), ScaledPixels(80.0)),
),
Corners {
top_left: ScaledPixels(4.0),
top_right: ScaledPixels(5.0),
bottom_right: ScaledPixels(6.0),
bottom_left: ScaledPixels(7.0),
},
);

assert_eq!(
retained_layer_clip(&mask),
Some(RetainedLayerClip {
left: 2.0,
top: 3.0,
right: 102.0,
bottom: 83.0,
top_left_radius: 4.0,
top_right_radius: 5.0,
bottom_right_radius: 6.0,
bottom_left_radius: 7.0,
})
);
}
}

mod dxgi {
Expand Down
42 changes: 41 additions & 1 deletion crates/gpui_windows/src/retained_compositor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ use std::collections::{HashMap, HashSet};
use anyhow::{Context, Result};
use windows::{
Win32::Graphics::{
DirectComposition::{IDCompositionDevice, IDCompositionVisual, IDCompositionVisual3},
DirectComposition::{
IDCompositionClip, IDCompositionDevice, IDCompositionVisual, IDCompositionVisual3,
},
Dxgi::IDXGISwapChain1,
},
core::Interface,
Expand All @@ -20,6 +22,18 @@ pub(crate) struct RetainedLayerState {
pub(crate) opacity: f32,
}

#[derive(Clone, Copy, Debug, PartialEq)]
pub(crate) struct RetainedLayerClip {
pub(crate) left: f32,
pub(crate) top: f32,
pub(crate) right: f32,
pub(crate) bottom: f32,
pub(crate) top_left_radius: f32,
pub(crate) top_right_radius: f32,
pub(crate) bottom_right_radius: f32,
pub(crate) bottom_left_radius: f32,
}

pub(crate) enum RetainedLayerContent<'a> {
SwapChain(&'a IDXGISwapChain1),
}
Expand Down Expand Up @@ -105,6 +119,32 @@ impl RetainedCompositor {
Ok(())
}

pub(crate) fn set_root_clip(&self, clip: Option<RetainedLayerClip>) -> Result<()> {
let Some(clip) = clip else {
return unsafe { self.root_visual.SetClip(None::<&IDCompositionClip>) }
.context("clearing retained DirectComposition clip");
};

let rectangle_clip = unsafe { self.comp_device.CreateRectangleClip() }
.context("creating retained DirectComposition clip")?;
unsafe {
rectangle_clip.SetLeft2(clip.left)?;
rectangle_clip.SetTop2(clip.top)?;
rectangle_clip.SetRight2(clip.right)?;
rectangle_clip.SetBottom2(clip.bottom)?;
rectangle_clip.SetTopLeftRadiusX2(clip.top_left_radius)?;
rectangle_clip.SetTopLeftRadiusY2(clip.top_left_radius)?;
rectangle_clip.SetTopRightRadiusX2(clip.top_right_radius)?;
rectangle_clip.SetTopRightRadiusY2(clip.top_right_radius)?;
rectangle_clip.SetBottomRightRadiusX2(clip.bottom_right_radius)?;
rectangle_clip.SetBottomRightRadiusY2(clip.bottom_right_radius)?;
rectangle_clip.SetBottomLeftRadiusX2(clip.bottom_left_radius)?;
rectangle_clip.SetBottomLeftRadiusY2(clip.bottom_left_radius)?;
self.root_visual.SetClip(&rectangle_clip)?;
}
Ok(())
}

pub(crate) fn commit(&self) -> Result<()> {
unsafe { self.comp_device.Commit() }.context("committing retained DirectComposition layers")
}
Expand Down
Loading