Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Share the GL bindings when creating a new glutin window which shares GL objects

Browse source
This commit is contained in:
Alan Jeffrey 2019-09-20 09:59:32 -05:00
parent 8bc8981ae5
commit 8e95efb8b2
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ports/glutin/headed_window.rs
View file

@ -85,7 +85,7 @@ fn window_creation_scale_factor() -> Scale<f32, DeviceIndependentPixel, DevicePi
impl Window { impl Window {
pub fn new( pub fn new(
win_size: Size2D<u32, DeviceIndependentPixel>, win_size: Size2D<u32, DeviceIndependentPixel>,
sharing: Option<&GlContext>, sharing: Option<&Window>,
events_loop: Rc<RefCell<EventsLoop>>, events_loop: Rc<RefCell<EventsLoop>>,
) -> Window { ) -> Window {
let opts = opts::get(); let opts = opts::get();
@ -119,7 +119,11 @@ impl Window {
} }
let context = match sharing { let context = match sharing {
Some(sharing) => sharing.new_window(context_builder, window_builder, events_loop.borrow().as_winit()), Some(sharing) => sharing.gl_context.borrow().new_window(
context_builder,
window_builder,
events_loop.borrow().as_winit()
),
None => context_builder.build_windowed(window_builder, events_loop.borrow().as_winit()), None => context_builder.build_windowed(window_builder, events_loop.borrow().as_winit()),
}.expect("Failed to create window."); }.expect("Failed to create window.");
@ -149,7 +153,9 @@ impl Window {
context.window().show(); context.window().show();
let gl = match context.get_api() { let gl = if let Some(sharing) = sharing {
sharing.gl.clone()
} else { match context.get_api() {
Api::OpenGl => unsafe { Api::OpenGl => unsafe {
gl::GlFns::load_with(|s| context.get_proc_address(s) as *const _) gl::GlFns::load_with(|s| context.get_proc_address(s) as *const _)
}, },
@ -157,7 +163,7 @@ impl Window {
gl::GlesFns::load_with(|s| context.get_proc_address(s) as *const _) gl::GlesFns::load_with(|s| context.get_proc_address(s) as *const _)
}, },
Api::WebGl => unreachable!("webgl is unsupported"), Api::WebGl => unreachable!("webgl is unsupported"),
}; } };
gl.clear_color(0.6, 0.6, 0.6, 1.0); gl.clear_color(0.6, 0.6, 0.6, 1.0);
gl.clear(gl::COLOR_BUFFER_BIT); gl.clear(gl::COLOR_BUFFER_BIT);
@ -494,10 +500,9 @@ impl webxr::glwindow::GlWindow for Window {
} }
fn new_window(&self) -> Result<Box<dyn webxr::glwindow::GlWindow>, ()> { fn new_window(&self) -> Result<Box<dyn webxr::glwindow::GlWindow>, ()> {
let gl_context = self.gl_context.borrow();
Ok(Box::new(Window::new( Ok(Box::new(Window::new(
self.inner_size.get(), self.inner_size.get(),
Some(&*gl_context), Some(self),
self.events_loop.clone(), self.events_loop.clone(),
))) )))
} }