diff --git a/Cargo.lock b/Cargo.lock index 7e7d21ff112..0be54a7ec2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4142,7 +4142,6 @@ dependencies = [ "servo_config", "servo_geometry", "servo_url", - "sparkle", "style", "style_traits", "surfman", diff --git a/components/canvas/webgl_mode/inprocess.rs b/components/canvas/webgl_mode/inprocess.rs index d393fed476b..eb627d5ca99 100644 --- a/components/canvas/webgl_mode/inprocess.rs +++ b/components/canvas/webgl_mode/inprocess.rs @@ -5,11 +5,10 @@ use std::default::Default; use std::sync::{Arc, Mutex}; -use canvas_traits::webgl::{webgl_channel, WebGLContextId, WebGLMsg, WebGLThreads}; +use canvas_traits::webgl::{webgl_channel, GlType, WebGLContextId, WebGLMsg, WebGLThreads}; use euclid::default::Size2D; use fnv::FnvHashMap; use log::debug; -use sparkle::gl::GlType; use surfman::chains::{SwapChainAPI, SwapChains, SwapChainsAPI}; use surfman::{Device, SurfaceInfo, SurfaceTexture}; use webrender::RenderApiSender; diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs index 8d0cad8de31..dd9ddff07b5 100644 --- a/components/canvas/webgl_thread.rs +++ b/components/canvas/webgl_thread.rs @@ -211,7 +211,7 @@ pub(crate) struct WebGLThread { /// The swap chains used by webrender webrender_swap_chains: SwapChains, /// Whether this context is a GL or GLES context. - api_type: gl::GlType, + api_type: GlType, /// The bridge to WebXR pub webxr_bridge: WebXRBridge, } @@ -226,7 +226,7 @@ pub(crate) struct WebGLThreadInit { pub webrender_swap_chains: SwapChains, pub connection: Connection, pub adapter: Adapter, - pub api_type: gl::GlType, + pub api_type: GlType, pub webxr_init: WebXRBridgeInit, } @@ -553,20 +553,20 @@ impl WebGLThread { ); let gl = match self.api_type { - gl::GlType::Gl => Gl::gl_fns(gl::ffi_gl::Gl::load_with(|symbol_name| { + GlType::Gl => Gl::gl_fns(gl::ffi_gl::Gl::load_with(|symbol_name| { self.device.get_proc_address(&ctx, symbol_name) })), - gl::GlType::Gles => Gl::gles_fns(gl::ffi_gles::Gles2::load_with(|symbol_name| { + GlType::Gles => Gl::gles_fns(gl::ffi_gles::Gles2::load_with(|symbol_name| { self.device.get_proc_address(&ctx, symbol_name) })), }; let glow = unsafe { match self.api_type { - gl::GlType::Gl => glow::Context::from_loader_function(|symbol_name| { + 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| { + GlType::Gles => glow::Context::from_loader_function(|symbol_name| { self.device.get_proc_address(&ctx, symbol_name) }), } @@ -2901,12 +2901,12 @@ fn clamp_viewport(gl: &Gl, size: Size2D) -> Size2D { } trait ToSurfmanVersion { - fn to_surfman_version(self, api_type: gl::GlType) -> GLVersion; + fn to_surfman_version(self, api_type: GlType) -> GLVersion; } impl ToSurfmanVersion for WebGLVersion { - fn to_surfman_version(self, api_type: gl::GlType) -> GLVersion { - if api_type == gl::GlType::Gles { + fn to_surfman_version(self, api_type: GlType) -> GLVersion { + if api_type == GlType::Gles { return GLVersion::new(3, 0); } match self { @@ -2923,7 +2923,7 @@ trait SurfmanContextAttributeFlagsConvert { fn to_surfman_context_attribute_flags( &self, webgl_version: WebGLVersion, - api_type: gl::GlType, + api_type: GlType, ) -> ContextAttributeFlags; } @@ -2931,13 +2931,13 @@ impl SurfmanContextAttributeFlagsConvert for GLContextAttributes { fn to_surfman_context_attribute_flags( &self, webgl_version: WebGLVersion, - api_type: gl::GlType, + api_type: GlType, ) -> ContextAttributeFlags { let mut flags = ContextAttributeFlags::empty(); flags.set(ContextAttributeFlags::ALPHA, self.alpha); flags.set(ContextAttributeFlags::DEPTH, self.depth); flags.set(ContextAttributeFlags::STENCIL, self.stencil); - if (webgl_version == WebGLVersion::WebGL1) && (api_type == gl::GlType::Gl) { + if (webgl_version == WebGLVersion::WebGL1) && (api_type == GlType::Gl) { flags.set(ContextAttributeFlags::COMPATIBILITY_PROFILE, true); } flags diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index f87790abb14..c13266d276f 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -73,7 +73,6 @@ servo-media-gstreamer = { workspace = true, optional = true } servo_config = { path = "../config" } servo_geometry = { path = "../geometry" } servo_url = { path = "../url" } -sparkle = { workspace = true } style = { workspace = true } style_traits = { workspace = true } surfman = { workspace = true } diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 2731431e471..5a039024b6c 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -30,7 +30,7 @@ use bluetooth::BluetoothThreadFactory; use bluetooth_traits::BluetoothRequest; use canvas::canvas_paint_thread::CanvasPaintThread; use canvas::WebGLComm; -use canvas_traits::webgl::WebGLThreads; +use canvas_traits::webgl::{GlType, WebGLThreads}; use compositing::webview::UnknownWebView; use compositing::windowing::{EmbedderEvent, EmbedderMethods, WindowMethods}; use compositing::{CompositeTarget, IOCompositor, InitialCompositorState, ShutdownState}; @@ -387,8 +387,8 @@ where // Create the webgl thread let gl_type = match webrender_gl.get_type() { - gleam::gl::GlType::Gl => sparkle::gl::GlType::Gl, - gleam::gl::GlType::Gles => sparkle::gl::GlType::Gles, + gleam::gl::GlType::Gl => GlType::Gl, + gleam::gl::GlType::Gles => GlType::Gles, }; let (external_image_handlers, external_images) = WebrenderExternalImageHandlers::new();