diff options
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | components/script/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/script/dom/vertexarrayobject.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/webgl_extensions/extensions.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/xrwebgllayer.rs | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock index 0be54a7ec2b..7753652d69d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6069,6 +6069,7 @@ dependencies = [ "fonts", "fonts_traits", "fxhash", + "glow 0.15.0", "headers", "html5ever", "http", @@ -6116,7 +6117,6 @@ dependencies = [ "servo_rand", "servo_url", "smallvec", - "sparkle", "style", "style_traits", "swapper", diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 7438d35aca4..235c946abb3 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -99,7 +99,7 @@ servo_geometry = { path = "../geometry" } servo_rand = { path = "../rand" } servo_url = { path = "../url" } smallvec = { workspace = true, features = ["union"] } -sparkle = { workspace = true } +glow = { workspace = true } style = { workspace = true } style_dom = { workspace = true } style_traits = { workspace = true } diff --git a/components/script/dom/vertexarrayobject.rs b/components/script/dom/vertexarrayobject.rs index 588ba601790..c8348278df0 100644 --- a/components/script/dom/vertexarrayobject.rs +++ b/components/script/dom/vertexarrayobject.rs @@ -124,7 +124,7 @@ impl VertexArrayObject { constants::FLOAT => 4, constants::INT | constants::UNSIGNED_INT if is_webgl2 => 4, constants2::HALF_FLOAT if is_webgl2 => 2, - sparkle::gl::FIXED if is_webgl2 => 4, + glow::FIXED if is_webgl2 => 4, constants2::INT_2_10_10_10_REV | constants2::UNSIGNED_INT_2_10_10_10_REV if is_webgl2 && size == 4 => { diff --git a/components/script/dom/webgl_extensions/extensions.rs b/components/script/dom/webgl_extensions/extensions.rs index f9d9bbee01d..c458593d6da 100644 --- a/components/script/dom/webgl_extensions/extensions.rs +++ b/components/script/dom/webgl_extensions/extensions.rs @@ -10,7 +10,7 @@ use canvas_traits::webgl::{GlType, TexFormat, WebGLSLVersion, WebGLVersion}; use fnv::{FnvHashMap, FnvHashSet}; use js::jsapi::JSObject; use malloc_size_of::MallocSizeOf; -use sparkle::gl::{self, GLenum}; +type GLenum = u32; use super::wrapper::{TypedWebGLExtensionWrapper, WebGLExtensionWrapper}; use super::{ext, WebGLExtension, WebGLExtensionSpec}; @@ -461,7 +461,7 @@ impl WebGLExtensions { if type_ == OESTextureHalfFloatConstants::HALF_FLOAT_OES && !self.supports_gl_extension("GL_OES_texture_half_float") { - return gl::HALF_FLOAT; + return glow::HALF_FLOAT; } type_ } diff --git a/components/script/dom/xrwebgllayer.rs b/components/script/dom/xrwebgllayer.rs index ded46063598..3812c8df2ea 100644 --- a/components/script/dom/xrwebgllayer.rs +++ b/components/script/dom/xrwebgllayer.rs @@ -139,9 +139,9 @@ impl XRWebGLLayer { fn texture_target(&self) -> u32 { if cfg!(target_os = "macos") { - sparkle::gl::TEXTURE_RECTANGLE + glow::TEXTURE_RECTANGLE } else { - sparkle::gl::TEXTURE_2D + glow::TEXTURE_2D } } |