Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update deps, back to env_logger, fix screen transform

Browse Source
This commit is contained in:
galister
2024-11-20 17:16:06 +09:00
parent 5ef2e40b5f
commit bdf02ea206
5 changed files with 293 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/overlays/screen.rs
View File

@@ -477,9 +477,11 @@ impl OverlayRenderer for ScreenRenderer {
continue;
}
self.extent.get_or_insert_with(|| {
self.transform = affine_from_format(&frame.format);
extent_from_format(frame.format, &app.session.config)
});
if let Some(new_transform) = affine_from_format(&frame.format) {
self.transform = new_transform;
}
match app.graphics.dmabuf_texture(frame) {
Ok(new) => {
let pipeline = match self.pipeline {
@@ -520,9 +522,11 @@ impl OverlayRenderer for ScreenRenderer {
continue;
};
self.extent.get_or_insert_with(|| {
self.transform = affine_from_format(&frame.format);
extent_from_format(frame.format, &app.session.config)
});
if let Some(new_transform) = affine_from_format(&frame.format) {
self.transform = new_transform;
}
log::debug!("{}: New MemFd frame", self.name);
let format = fourcc_to_vk(frame.format.fourcc)?;
@@ -1053,29 +1057,30 @@ fn extent_from_res(width: u32, height: u32, config: &GeneralConfig) -> [u32; 3]
[w, h, 1]
}
fn affine_from_format(format: &FrameFormat) -> Affine3A {
fn affine_from_format(format: &FrameFormat) -> Option<Affine3A> {
const FLIP_X: Vec3 = Vec3 {
x: -1.0,
y: 1.0,
z: 1.0,
};
match format.transform {
wlx_frame::Transform::None => Affine3A::IDENTITY,
wlx_frame::Transform::Rotated90 => Affine3A::from_rotation_z(PI / 2.0),
Some(match format.transform {
wlx_frame::Transform::Normal => Affine3A::IDENTITY,
wlx_frame::Transform::Rotated90 => Affine3A::from_rotation_z(-PI / 2.0),
wlx_frame::Transform::Rotated180 => Affine3A::from_rotation_z(PI),
wlx_frame::Transform::Rotated270 => Affine3A::from_rotation_z(-PI / 2.0),
wlx_frame::Transform::Rotated270 => Affine3A::from_rotation_z(PI / 2.0),
wlx_frame::Transform::Flipped => Affine3A::from_scale(FLIP_X),
wlx_frame::Transform::Flipped90 => {
Affine3A::from_scale(FLIP_X) * Affine3A::from_rotation_z(PI / 2.0)
Affine3A::from_scale(FLIP_X) * Affine3A::from_rotation_z(-PI / 2.0)
}
wlx_frame::Transform::Flipped180 => {
Affine3A::from_scale(FLIP_X) * Affine3A::from_rotation_z(PI)
}
wlx_frame::Transform::Flipped270 => {
Affine3A::from_scale(FLIP_X) * Affine3A::from_rotation_z(-PI / 2.0)
Affine3A::from_scale(FLIP_X) * Affine3A::from_rotation_z(PI / 2.0)
}
}
wlx_frame::Transform::Undefined => return None,
})
}
#[cfg(all(feature = "pipewire", feature = "x11"))]