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

fix mirrors on openvr

Browse Source
This commit is contained in:
galister
2025-04-22 04:48:33 +09:00
parent 2620a791b9
commit 33354935f0
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/overlays/mirror.rs
View File

@@ -133,10 +133,7 @@ impl OverlayRenderer for MirrorRenderer {
} }
fn frame_meta(&mut self) -> Option<FrameMeta> { fn frame_meta(&mut self) -> Option<FrameMeta> {
Some(FrameMeta { self.renderer.as_mut().and_then(ScreenRenderer::frame_meta)
extent: self.last_extent,
..Default::default()
})
} }
} }

20
src/overlays/screen.rs
View File

@@ -546,15 +546,15 @@ impl OverlayRenderer for ScreenRenderer {
} }
if let Some(frame) = self.capture.receive() { if let Some(frame) = self.capture.receive() {
self.meta = Some(FrameMeta {
extent: extent_from_format(frame.format, &app.session.config),
transform: affine_from_format(&frame.format),
format: frame.image.format(),
});
self.cur_frame = Some(frame); self.cur_frame = Some(frame);
} }
if let (Some(capture), None) = (self.cur_frame.as_ref(), self.meta.as_ref()) { if let (Some(capture), None) = (self.cur_frame.as_ref(), self.pipeline.as_ref()) {
self.meta = Some(FrameMeta {
extent: extent_from_format(capture.format, &app.session.config),
transform: affine_from_format(&capture.format),
format: capture.image.format(),
});
self.pipeline = Some({ self.pipeline = Some({
let mut pipeline = ScreenPipeline::new(&capture.image.extent(), app)?; let mut pipeline = ScreenPipeline::new(&capture.image.extent(), app)?;
let mut upload = app.graphics.create_uploads_command_buffer( let mut upload = app.graphics.create_uploads_command_buffer(
@@ -1028,10 +1028,6 @@ impl From<wl_output::Transform> for Transform {
} }
fn extent_from_format(fmt: FrameFormat, config: &GeneralConfig) -> [u32; 3] { fn extent_from_format(fmt: FrameFormat, config: &GeneralConfig) -> [u32; 3] {
extent_from_res(fmt.width, fmt.height, config)
}
fn extent_from_res(width: u32, height: u32, config: &GeneralConfig) -> [u32; 3] {
// screens above a certain resolution will have severe aliasing // screens above a certain resolution will have severe aliasing
let height_limit = if config.screen_render_down { let height_limit = if config.screen_render_down {
u32::from(config.screen_max_height.min(2560)) u32::from(config.screen_max_height.min(2560))
@@ -1039,8 +1035,8 @@ fn extent_from_res(width: u32, height: u32, config: &GeneralConfig) -> [u32; 3]
2560 2560
}; };
let h = height.min(height_limit); let h = fmt.height.min(height_limit);
let w = (width as f32 / height as f32 * h as f32) as u32; let w = (fmt.width as f32 / fmt.height as f32 * h as f32) as u32;
[w, h, 1] [w, h, 1]
} }