implements PLN-0116
This commit is contained in:
@@ -6,11 +6,12 @@ mod services;
|
||||
pub use crash_report::CrashReport;
|
||||
pub use os::{LifecycleError, LifecycleOperation, SystemOS};
|
||||
pub use programs::{NativeShellApp, PrometeuHub, SystemProfileAction, SystemProfileUpdate};
|
||||
pub use prometeu_hal::{RenderWorkerBackend, RenderWorkerFrameSink};
|
||||
pub use services::fs;
|
||||
pub use services::process;
|
||||
pub use services::task;
|
||||
pub use services::vm_runtime::{
|
||||
RenderWorkerBackend, RenderWorkerConfig, RenderWorkerController, RenderWorkerFrameSink,
|
||||
RenderWorkerHandoff, RenderWorkerHandoffWait, VirtualMachineRuntime,
|
||||
RenderWorkerConfig, RenderWorkerController, RenderWorkerHandoff, RenderWorkerHandoffWait,
|
||||
VirtualMachineRuntime,
|
||||
};
|
||||
pub use services::windows;
|
||||
|
||||
@@ -21,9 +21,7 @@ use prometeu_hal::telemetry::{AtomicTelemetry, CertificationConfig, Certifier};
|
||||
use prometeu_hal::{Gfx2dCommand, GfxUiCommand};
|
||||
use prometeu_vm::VirtualMachine;
|
||||
pub use render_manager::{RenderManager, RenderRuntimeCapabilities};
|
||||
pub use render_worker::{
|
||||
RenderWorkerBackend, RenderWorkerConfig, RenderWorkerController, RenderWorkerFrameSink,
|
||||
};
|
||||
pub use render_worker::{RenderWorkerConfig, RenderWorkerController};
|
||||
pub use render_worker_handoff::{RenderWorkerHandoff, RenderWorkerHandoffWait};
|
||||
use std::collections::HashMap;
|
||||
use std::sync::Arc;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use crate::services::vm_runtime::{RenderWorkerHandoff, RenderWorkerHandoffWait};
|
||||
use prometeu_hal::{
|
||||
FrameId, OwnedRgba8888Frame, RenderSubmission, RenderWorkerError, RenderWorkerTelemetry,
|
||||
FrameId, RenderWorkerBackend, RenderWorkerError, RenderWorkerFrameSink, RenderWorkerTelemetry,
|
||||
};
|
||||
use std::panic::{AssertUnwindSafe, catch_unwind};
|
||||
use std::sync::mpsc::{self, Receiver, RecvTimeoutError};
|
||||
@@ -8,17 +8,6 @@ use std::sync::{Arc, Mutex};
|
||||
use std::thread::{self, JoinHandle};
|
||||
use std::time::Duration;
|
||||
|
||||
pub trait RenderWorkerBackend: Send + 'static {
|
||||
fn render(
|
||||
&self,
|
||||
submission: &RenderSubmission,
|
||||
) -> Result<OwnedRgba8888Frame, RenderWorkerError>;
|
||||
}
|
||||
|
||||
pub trait RenderWorkerFrameSink: Send + 'static {
|
||||
fn publish(&self, frame: OwnedRgba8888Frame) -> Result<(), RenderWorkerError>;
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub struct RenderWorkerConfig {
|
||||
pub shutdown_timeout: Duration,
|
||||
@@ -173,20 +162,23 @@ mod tests {
|
||||
use crate::services::vm_runtime::render_worker_test_harness::{
|
||||
FakeRenderBackend, RenderGate, game_submission,
|
||||
};
|
||||
use prometeu_hal::{FrameId, OwnedRgba8888Frame};
|
||||
use prometeu_hal::{FrameId, OwnedRgba8888Frame, RenderSubmission};
|
||||
|
||||
impl RenderWorkerBackend for Arc<FakeRenderBackend> {
|
||||
#[derive(Clone, Debug)]
|
||||
struct SharedFakeBackend(Arc<FakeRenderBackend>);
|
||||
|
||||
impl RenderWorkerBackend for SharedFakeBackend {
|
||||
fn render(
|
||||
&self,
|
||||
submission: &RenderSubmission,
|
||||
) -> Result<OwnedRgba8888Frame, RenderWorkerError> {
|
||||
FakeRenderBackend::render(self, submission)
|
||||
self.0.render(submission)
|
||||
}
|
||||
}
|
||||
|
||||
impl RenderWorkerFrameSink for Arc<FakeRenderBackend> {
|
||||
impl RenderWorkerFrameSink for SharedFakeBackend {
|
||||
fn publish(&self, frame: OwnedRgba8888Frame) -> Result<(), RenderWorkerError> {
|
||||
FakeRenderBackend::publish(self, frame);
|
||||
self.0.publish(frame);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
@@ -219,8 +211,8 @@ mod tests {
|
||||
let mut controller = RenderWorkerController::start(
|
||||
RenderWorkerConfig::default(),
|
||||
Arc::clone(&handoff),
|
||||
Arc::clone(&backend),
|
||||
backend,
|
||||
SharedFakeBackend(Arc::clone(&backend)),
|
||||
SharedFakeBackend(backend),
|
||||
);
|
||||
|
||||
assert_eq!(controller.stop(), Ok(()));
|
||||
@@ -234,8 +226,8 @@ mod tests {
|
||||
let mut controller = RenderWorkerController::start(
|
||||
RenderWorkerConfig::default(),
|
||||
Arc::clone(&handoff),
|
||||
Arc::clone(&backend),
|
||||
Arc::clone(&backend),
|
||||
SharedFakeBackend(Arc::clone(&backend)),
|
||||
SharedFakeBackend(Arc::clone(&backend)),
|
||||
);
|
||||
|
||||
handoff.publish(game_submission(11, 1, 1));
|
||||
@@ -255,8 +247,8 @@ mod tests {
|
||||
let mut controller = RenderWorkerController::start(
|
||||
RenderWorkerConfig { shutdown_timeout: Duration::from_millis(1) },
|
||||
Arc::clone(&handoff),
|
||||
Arc::clone(&backend),
|
||||
Arc::clone(&backend),
|
||||
SharedFakeBackend(Arc::clone(&backend)),
|
||||
SharedFakeBackend(Arc::clone(&backend)),
|
||||
);
|
||||
|
||||
handoff.publish(game_submission(12, 1, 1));
|
||||
|
||||
Reference in New Issue
Block a user