diff --git a/examples/android/src/lib.rs b/examples/android/src/lib.rs index da5cc47..4f90881 100644 --- a/examples/android/src/lib.rs +++ b/examples/android/src/lib.rs @@ -24,7 +24,6 @@ fn main() { app_info: XrAppInfo { name: "Bevy OXR Android Example".into(), }, - enable_pipelined_rendering: true, ..Default::default() }) // .add_plugins(OpenXrDebugRenderer) diff --git a/src/lib.rs b/src/lib.rs index 8bd3aa9..2955bc9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -51,8 +51,6 @@ pub struct OpenXrPlugin { pub reqeusted_extensions: XrExtensions, pub prefered_blend_mode: XrPreferdBlendMode, pub app_info: XrAppInfo, - /// Experimental might break stuff - pub enable_pipelined_rendering: bool, pub synchronous_pipeline_compilation: bool, } @@ -121,9 +119,6 @@ impl Plugin for OpenXrPlugin { app.add_plugins(RenderPlugin::default()); app.insert_resource(XrStatus::Disabled); } - if self.enable_pipelined_rendering { - app.insert_resource(DoPipelinedRendering); - } app.add_systems(XrPostCleanup, clean_resources); app.add_systems(XrPostCleanup, || info!("Main World Post Cleanup!")); app.add_systems( @@ -187,9 +182,6 @@ pub enum Backend { D3D12, } -#[derive(Resource)] -struct DoPipelinedRendering; - fn clean_resources_render(mut cmds: &mut World) { // let session = cmds.remove_resource::().unwrap(); cmds.remove_resource::(); @@ -261,8 +253,6 @@ pub struct DefaultXrPlugins { pub reqeusted_extensions: XrExtensions, pub prefered_blend_mode: XrPreferdBlendMode, pub app_info: XrAppInfo, - /// Experimental might break stuff - pub enable_pipelined_rendering: bool, pub synchronous_pipeline_compilation: bool, } impl Default for DefaultXrPlugins { @@ -277,7 +267,6 @@ impl Default for DefaultXrPlugins { reqeusted_extensions: default(), prefered_blend_mode: default(), app_info: default(), - enable_pipelined_rendering: false, synchronous_pipeline_compilation: false, } } @@ -285,7 +274,7 @@ impl Default for DefaultXrPlugins { impl PluginGroup for DefaultXrPlugins { fn build(self) -> PluginGroupBuilder { - let plugins = DefaultPlugins + DefaultPlugins .build() .set(TaskPoolPlugin { task_pool_options: TaskPoolOptions { @@ -299,12 +288,12 @@ impl PluginGroup for DefaultXrPlugins { }, }) .disable::() + .disable::() .add_before::(OpenXrPlugin { backend_preference: self.backend_preference, prefered_blend_mode: self.prefered_blend_mode, reqeusted_extensions: self.reqeusted_extensions, app_info: self.app_info.clone(), - enable_pipelined_rendering: self.enable_pipelined_rendering, synchronous_pipeline_compilation: self.synchronous_pipeline_compilation, }) .add_after::(XrInitPlugin) @@ -333,12 +322,7 @@ impl PluginGroup for DefaultXrPlugins { #[cfg(target_os = "android")] close_when_requested: true, ..default() - }); - if !self.enable_pipelined_rendering { - plugins.disable::() - } else { - plugins - } + }) } } @@ -431,13 +415,6 @@ pub fn xr_wait_frame( } }; let should_render = world.get_resource::().unwrap().should_render; - if world.contains_resource::() { - let mut frame_state = world.resource_mut::(); - frame_state.predicted_display_time = xr::Time::from_nanos( - frame_state.predicted_display_time.as_nanos() - + frame_state.predicted_display_period.as_nanos(), - ); - } **world.get_resource_mut::().unwrap() = should_render; **world.get_resource_mut::().unwrap() = true; }