Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to surfman&webxr without sparkle and use glow 0.15 (#33538)

Browse source 
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
Samson 2024-10-18 19:16:48 +02:00 • committed by GitHub
parent f73ae0414b
commit a58da5aa83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 46 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/canvas/webgl_thread.rs
View file

@ -54,6 +54,7 @@ use crate::webgl_limits::GLLimitsDetect;
struct GLContextData {
ctx: Context,
gl: Rc<Gl>,
glow: glow::Context,
state: GLState,
attributes: GLContextAttributes,
}
@ -560,6 +561,17 @@ impl WebGLThread {
})),
};
let glow = unsafe {
match self.api_type {
gl::GlType::Gl => glow::Context::from_loader_function(|symbol_name| {
self.device.get_proc_address(&ctx, symbol_name)
}),
gl::GlType::Gles => glow::Context::from_loader_function(|symbol_name| {
self.device.get_proc_address(&ctx, symbol_name)
}),
}
};
let limits = GLLimits::detect(&gl, webgl_version);
let size = clamp_viewport(&gl, requested_size);
@ -622,6 +634,7 @@ impl WebGLThread {
GLContextData {
ctx,
gl,
glow,
state,
attributes,
},
@ -674,7 +687,7 @@ impl WebGLThread {
.resize(&mut self.device, &mut data.ctx, size.to_i32())
.map_err(|err| format!("Failed to resize swap chain: {:?}", err))?;
swap_chain
.clear_surface(&mut self.device, &mut data.ctx, &data.gl, clear_color)
.clear_surface(&mut self.device, &mut data.ctx, &data.glow, clear_color)
.map_err(|err| format!("Failed to clear resized swap chain: {:?}", err))?;
} else {
error!("Failed to find swap chain");
@ -777,7 +790,7 @@ impl WebGLThread {
&mut self.device,
&mut data.ctx,
if data.attributes.preserve_drawing_buffer {
PreserveBuffer::Yes(&data.gl)
PreserveBuffer::Yes(&data.glow)
} else {
PreserveBuffer::No
},
@ -793,7 +806,7 @@ impl WebGLThread {
.contains(ContextAttributeFlags::ALPHA);
let clear_color = [0.0, 0.0, 0.0, !alpha as i32 as f32];
swap_chain
.clear_surface(&mut self.device, &mut data.ctx, &data.gl, clear_color)
.clear_surface(&mut self.device, &mut data.ctx, &data.glow, clear_color)
.unwrap();
debug_assert_eq!(data.gl.get_error(), gl::NO_ERROR);
}
@ -3303,13 +3316,13 @@ impl<'a> WebXRContexts<WebXRSurfman> for WebXRBridgeContexts<'a> {
)?;
Some(&mut data.ctx)
}
fn bindings(&mut self, device: &Device, context_id: WebXRContextId) -> Option<&Gl> {
fn bindings(&mut self, device: &Device, context_id: WebXRContextId) -> Option<&glow::Context> {
let data = WebGLThread::make_current_if_needed(
device,
WebGLContextId::from(context_id),
self.contexts,
self.bound_context_id,
)?;
Some(&data.gl)
Some(&data.glow)
}
}