implements PLN-0095
This commit is contained in:
@@ -23,6 +23,7 @@ impl VirtualMachineRuntime {
|
||||
current_cartridge_app_version: String::new(),
|
||||
current_cartridge_app_mode: AppMode::Game,
|
||||
frame_scheduler: FrameScheduler::default(),
|
||||
render_capabilities: RenderRuntimeCapabilities::default(),
|
||||
render_manager: RenderManager::new(AppMode::Game),
|
||||
gfx2d_commands: Vec::new(),
|
||||
gfxui_commands: Vec::new(),
|
||||
@@ -121,6 +122,7 @@ impl VirtualMachineRuntime {
|
||||
self.current_cartridge_app_version.clear();
|
||||
self.current_cartridge_app_mode = AppMode::Game;
|
||||
self.frame_scheduler = FrameScheduler::default();
|
||||
self.render_capabilities = RenderRuntimeCapabilities::default();
|
||||
self.render_manager = RenderManager::new(AppMode::Game);
|
||||
self.gfx2d_commands.clear();
|
||||
self.gfxui_commands.clear();
|
||||
@@ -141,6 +143,10 @@ impl VirtualMachineRuntime {
|
||||
self.clear_cartridge_state();
|
||||
}
|
||||
|
||||
pub fn set_render_runtime_capabilities(&mut self, capabilities: RenderRuntimeCapabilities) {
|
||||
self.render_capabilities = capabilities;
|
||||
}
|
||||
|
||||
pub fn initialize_vm(
|
||||
&mut self,
|
||||
log_service: &mut LogService,
|
||||
|
||||
@@ -14,7 +14,7 @@ use prometeu_hal::log::LogService;
|
||||
use prometeu_hal::telemetry::{AtomicTelemetry, CertificationConfig, Certifier};
|
||||
use prometeu_hal::{Gfx2dCommand, GfxUiCommand};
|
||||
use prometeu_vm::VirtualMachine;
|
||||
pub use render_manager::RenderManager;
|
||||
pub use render_manager::{RenderManager, RenderRuntimeCapabilities};
|
||||
use std::collections::HashMap;
|
||||
use std::sync::Arc;
|
||||
use std::sync::atomic::AtomicU32;
|
||||
@@ -31,6 +31,7 @@ pub struct VirtualMachineRuntime {
|
||||
pub current_cartridge_app_version: String,
|
||||
pub current_cartridge_app_mode: AppMode,
|
||||
pub frame_scheduler: FrameScheduler,
|
||||
pub render_capabilities: RenderRuntimeCapabilities,
|
||||
pub render_manager: RenderManager,
|
||||
pub gfx2d_commands: Vec<Gfx2dCommand>,
|
||||
pub gfxui_commands: Vec<GfxUiCommand>,
|
||||
|
||||
@@ -29,6 +29,17 @@ pub enum RenderExecutionPolicy {
|
||||
WorkerCapableWithLocalFallback,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
|
||||
pub struct RenderRuntimeCapabilities {
|
||||
pub game_render_worker: bool,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum RenderConsumerPath {
|
||||
LocalSynchronous,
|
||||
LocalWorkerPrototype,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub struct RenderPolicy {
|
||||
pub app_mode: AppMode,
|
||||
@@ -55,12 +66,37 @@ impl RenderPolicy {
|
||||
pub const fn uses_frame_scheduler(self) -> bool {
|
||||
matches!(self.pacing, RenderPacingPolicy::FrameScheduled)
|
||||
}
|
||||
|
||||
pub const fn resolve_consumer_path(
|
||||
self,
|
||||
capabilities: RenderRuntimeCapabilities,
|
||||
) -> RenderConsumerPath {
|
||||
match (self.execution, capabilities.game_render_worker) {
|
||||
(RenderExecutionPolicy::WorkerCapableWithLocalFallback, true) => {
|
||||
RenderConsumerPath::LocalWorkerPrototype
|
||||
}
|
||||
_ => RenderConsumerPath::LocalSynchronous,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub trait RenderSurface {
|
||||
fn consume_submission(&mut self, submission: &RenderSubmission);
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
pub struct LocalRenderWorker;
|
||||
|
||||
impl LocalRenderWorker {
|
||||
pub fn consume_latest<S: RenderSurface>(
|
||||
&mut self,
|
||||
manager: &mut RenderManager,
|
||||
surface: &mut S,
|
||||
) -> bool {
|
||||
manager.publish_latest(surface)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
|
||||
pub struct RenderTelemetrySnapshot {
|
||||
pub produced_submissions: u64,
|
||||
@@ -499,6 +535,30 @@ mod tests {
|
||||
assert!(!policy.uses_frame_scheduler());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn render_policy_resolves_game_worker_only_when_capability_is_enabled() {
|
||||
let policy = RenderPolicy::for_app_mode(AppMode::Game);
|
||||
|
||||
assert_eq!(
|
||||
policy.resolve_consumer_path(RenderRuntimeCapabilities::default()),
|
||||
RenderConsumerPath::LocalSynchronous
|
||||
);
|
||||
assert_eq!(
|
||||
policy.resolve_consumer_path(RenderRuntimeCapabilities { game_render_worker: true }),
|
||||
RenderConsumerPath::LocalWorkerPrototype
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn render_policy_keeps_shell_local_even_when_worker_capability_is_enabled() {
|
||||
let policy = RenderPolicy::for_app_mode(AppMode::Shell);
|
||||
|
||||
assert_eq!(
|
||||
policy.resolve_consumer_path(RenderRuntimeCapabilities { game_render_worker: true }),
|
||||
RenderConsumerPath::LocalSynchronous
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn active_render_policy_follows_app_mode_transition() {
|
||||
let mut manager = RenderManager::new(AppMode::Game);
|
||||
@@ -522,6 +582,20 @@ mod tests {
|
||||
assert_eq!(surface.seen, vec![FrameId::new(0)]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn local_render_worker_consumes_latest_game_submission() {
|
||||
let mut manager = RenderManager::new(AppMode::Game);
|
||||
let mut surface = RecordingSurface::default();
|
||||
let mut worker = LocalRenderWorker;
|
||||
|
||||
manager.close_compat_frame();
|
||||
assert!(worker.consume_latest(&mut manager, &mut surface));
|
||||
|
||||
assert_eq!(surface.seen, vec![FrameId::ZERO]);
|
||||
assert_eq!(manager.render_telemetry().consumed_submissions, 1);
|
||||
assert_eq!(manager.render_telemetry().presented_frames, 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn render_handoff_takes_owned_latest_submission() {
|
||||
let mut handoff = RenderHandoff::default();
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use super::dispatch::VmRuntimeHost;
|
||||
use super::render_manager::RenderSurface;
|
||||
use super::render_manager::{LocalRenderWorker, RenderConsumerPath, RenderSurface};
|
||||
use super::*;
|
||||
use crate::CrashReport;
|
||||
use crate::fs::{FsState, VirtualFS};
|
||||
@@ -261,7 +261,19 @@ impl VirtualMachineRuntime {
|
||||
|
||||
if let Err(payload) = catch_unwind(AssertUnwindSafe(|| {
|
||||
let mut surface = HardwareRenderSurface { hw };
|
||||
self.render_manager.publish_latest(&mut surface);
|
||||
match self
|
||||
.render_manager
|
||||
.active_render_policy()
|
||||
.resolve_consumer_path(self.render_capabilities)
|
||||
{
|
||||
RenderConsumerPath::LocalSynchronous => {
|
||||
self.render_manager.publish_latest(&mut surface);
|
||||
}
|
||||
RenderConsumerPath::LocalWorkerPrototype => {
|
||||
let mut worker = LocalRenderWorker;
|
||||
worker.consume_latest(&mut self.render_manager, &mut surface);
|
||||
}
|
||||
}
|
||||
})) {
|
||||
let message = Self::host_panic_payload_to_string(payload);
|
||||
let report = CrashReport::VmPanic { message, pc: Some(vm.pc() as u32) };
|
||||
|
||||
Reference in New Issue
Block a user