mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Replace use of gleam in webgl with sparkle.
This commit is contained in:
parent
ec1da1d01c
commit
1cefae7181
16 changed files with 103 additions and 72 deletions
|
@ -17,7 +17,6 @@ webgl_backtrace = []
|
|||
cssparser = "0.25"
|
||||
euclid = "0.20"
|
||||
ipc-channel = "0.12"
|
||||
gleam = "0.6.7"
|
||||
lazy_static = "1"
|
||||
malloc_size_of = { path = "../malloc_size_of" }
|
||||
malloc_size_of_derive = "0.1"
|
||||
|
@ -25,6 +24,7 @@ pixels = {path = "../pixels"}
|
|||
serde = "1.0"
|
||||
serde_bytes = "0.10"
|
||||
servo_config = {path = "../config"}
|
||||
sparkle = "0.1"
|
||||
typetag = "0.1"
|
||||
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
|
||||
webvr_traits = {path = "../webvr_traits"}
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use euclid::default::{Rect, Size2D};
|
||||
use gleam::gl;
|
||||
use gleam::gl::Gl;
|
||||
use ipc_channel::ipc::{IpcBytesReceiver, IpcBytesSender, IpcSharedMemory};
|
||||
use pixels::PixelFormat;
|
||||
use sparkle::gl;
|
||||
use sparkle::gl::Gl;
|
||||
use std::borrow::Cow;
|
||||
use std::fmt;
|
||||
use std::num::NonZeroU32;
|
||||
|
@ -549,7 +549,7 @@ pub enum WebVRCommand {
|
|||
// Trait object that handles WebVR commands.
|
||||
// Receives the texture id and size associated to the WebGLContext.
|
||||
pub trait WebVRRenderHandler: Send {
|
||||
fn handle(&mut self, gl: &dyn Gl, command: WebVRCommand, texture: Option<(u32, Size2D<i32>)>);
|
||||
fn handle(&mut self, gl: &Gl, command: WebVRCommand, texture: Option<(u32, Size2D<i32>)>);
|
||||
}
|
||||
|
||||
/// WebGL commands required to implement DOMToTexture feature.
|
||||
|
@ -758,9 +758,9 @@ macro_rules! gl_enums {
|
|||
}
|
||||
}
|
||||
|
||||
// FIXME: These should come from gleam
|
||||
// FIXME: These should come from sparkle
|
||||
mod gl_ext_constants {
|
||||
use gleam::gl::types::GLenum;
|
||||
use sparkle::gl::types::GLenum;
|
||||
|
||||
pub const COMPRESSED_RGB_S3TC_DXT1_EXT: GLenum = 0x83F0;
|
||||
pub const COMPRESSED_RGBA_S3TC_DXT1_EXT: GLenum = 0x83F1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue