implements PLN-0141
This commit is contained in:
@@ -83,6 +83,10 @@ impl HostInputHandler {
|
||||
self.system_controls.take_home_requested()
|
||||
}
|
||||
|
||||
pub fn clear_guest_signals(&mut self) {
|
||||
self.signals = InputSignals::default();
|
||||
}
|
||||
|
||||
pub fn handle_key_code(&mut self, code: KeyCode, state: ElementState) {
|
||||
let is_down = state == ElementState::Pressed;
|
||||
|
||||
@@ -229,4 +233,16 @@ mod tests {
|
||||
assert!(input.signals.up_signal);
|
||||
assert!(!input.take_home_requested());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn clearing_guest_signals_preserves_system_home_control() {
|
||||
let mut input = HostInputHandler::default();
|
||||
|
||||
input.handle_key_code(KeyCode::ArrowUp, ElementState::Pressed);
|
||||
input.handle_key_code(KeyCode::Escape, ElementState::Pressed);
|
||||
input.clear_guest_signals();
|
||||
|
||||
assert_no_pad_signal(input.signals);
|
||||
assert!(input.take_home_requested());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,8 +10,8 @@ use pixels::{Pixels, PixelsBuilder, SurfaceTexture};
|
||||
use prometeu_drivers::hardware::Hardware;
|
||||
use prometeu_drivers::{AudioCommand, LocalFramebufferRenderBackend, MemoryBanks};
|
||||
use prometeu_firmware::{BootTarget, Firmware, FirmwareState};
|
||||
use prometeu_hal::RuntimePlatform;
|
||||
use prometeu_hal::telemetry::CertificationConfig;
|
||||
use prometeu_hal::{OwnedRgba8888Frame, RenderOwnership, RuntimePlatform};
|
||||
use prometeu_system::{LatestRenderFrameStore, RenderWorkerConfig, discover_games_root};
|
||||
use std::sync::Arc;
|
||||
use std::time::{Duration, Instant};
|
||||
@@ -88,8 +88,12 @@ fn desired_control_flow(
|
||||
}
|
||||
}
|
||||
|
||||
fn should_present_worker_frame(state: &FirmwareState) -> bool {
|
||||
matches!(state, FirmwareState::GameRunning(_))
|
||||
fn should_present_worker_frame(
|
||||
state: &FirmwareState,
|
||||
frame: &OwnedRgba8888Frame,
|
||||
active_ownership: RenderOwnership,
|
||||
) -> bool {
|
||||
matches!(state, FirmwareState::GameRunning(_)) && frame.ownership == active_ownership
|
||||
}
|
||||
|
||||
/// The Desktop implementation of the PROMETEU Runtime.
|
||||
@@ -312,8 +316,13 @@ impl ApplicationHandler for HostRunner {
|
||||
{
|
||||
let frame = pixels.frame_mut();
|
||||
|
||||
if should_present_worker_frame(&self.firmware.state)
|
||||
&& let Some(worker_frame) = self.render_frame_store.latest_frame()
|
||||
let active_ownership = self.firmware.os.vm().active_render_ownership();
|
||||
if let Some(worker_frame) = self.render_frame_store.latest_frame()
|
||||
&& should_present_worker_frame(
|
||||
&self.firmware.state,
|
||||
&worker_frame,
|
||||
active_ownership,
|
||||
)
|
||||
{
|
||||
self.firmware
|
||||
.os
|
||||
@@ -373,6 +382,7 @@ impl ApplicationHandler for HostRunner {
|
||||
}
|
||||
|
||||
if self.input.take_home_requested() {
|
||||
self.input.clear_guest_signals();
|
||||
self.firmware.request_home_from_host();
|
||||
self.invalidate_host_surface();
|
||||
self.request_redraw_if_needed();
|
||||
@@ -405,7 +415,10 @@ impl ApplicationHandler for HostRunner {
|
||||
// Sync pause state with audio.
|
||||
// We do this AFTER firmware.tick to avoid MasterPause/Resume commands
|
||||
// being cleared by the OS if a new logical frame starts in this tick.
|
||||
let is_paused = self.firmware.os.vm().paused() || self.debugger.waiting_for_start;
|
||||
let lifecycle_audio_paused = self.firmware.game_lifecycle_audio_paused();
|
||||
let is_paused = lifecycle_audio_paused
|
||||
|| self.firmware.os.vm().paused()
|
||||
|| self.debugger.waiting_for_start;
|
||||
if is_paused != self.last_paused_state {
|
||||
self.last_paused_state = is_paused;
|
||||
let cmd =
|
||||
@@ -420,8 +433,9 @@ impl ApplicationHandler for HostRunner {
|
||||
self.stats.record_frame();
|
||||
}
|
||||
|
||||
if should_present_worker_frame(&self.firmware.state)
|
||||
&& let Some(worker_frame) = self.render_frame_store.latest_frame()
|
||||
let active_ownership = self.firmware.os.vm().active_render_ownership();
|
||||
if let Some(worker_frame) = self.render_frame_store.latest_frame()
|
||||
&& should_present_worker_frame(&self.firmware.state, &worker_frame, active_ownership)
|
||||
{
|
||||
self.presentation.note_published_frame(worker_frame.frame_id.get());
|
||||
} else {
|
||||
@@ -542,14 +556,39 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn worker_frame_presentation_is_game_only() {
|
||||
assert!(should_present_worker_frame(&FirmwareState::GameRunning(GameRunningStep::new(
|
||||
TaskId(1),
|
||||
))));
|
||||
assert!(!should_present_worker_frame(&FirmwareState::ShellRunning(ShellRunningStep::new(
|
||||
TaskId(2)
|
||||
),)));
|
||||
assert!(!should_present_worker_frame(&FirmwareState::HubHome(HubHomeStep)));
|
||||
fn worker_frame_presentation_requires_game_state_and_current_ownership() {
|
||||
let active = RenderOwnership::new(3, AppMode::Game, 1);
|
||||
let current = OwnedRgba8888Frame::packed(FrameId::new(9), active, 1, 1, vec![0xFF00FFFF])
|
||||
.expect("test frame");
|
||||
let stale = OwnedRgba8888Frame::packed(
|
||||
FrameId::new(8),
|
||||
RenderOwnership::new(2, AppMode::Game, 1),
|
||||
1,
|
||||
1,
|
||||
vec![0xFF00FFFF],
|
||||
)
|
||||
.expect("test frame");
|
||||
|
||||
assert!(should_present_worker_frame(
|
||||
&FirmwareState::GameRunning(GameRunningStep::new(TaskId(1))),
|
||||
¤t,
|
||||
active,
|
||||
));
|
||||
assert!(!should_present_worker_frame(
|
||||
&FirmwareState::GameRunning(GameRunningStep::new(TaskId(1),)),
|
||||
&stale,
|
||||
active,
|
||||
));
|
||||
assert!(!should_present_worker_frame(
|
||||
&FirmwareState::ShellRunning(ShellRunningStep::new(TaskId(2))),
|
||||
¤t,
|
||||
active,
|
||||
));
|
||||
assert!(!should_present_worker_frame(
|
||||
&FirmwareState::HubHome(HubHomeStep),
|
||||
¤t,
|
||||
active,
|
||||
));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
Reference in New Issue
Block a user