From a721b6824947fac49392b4a07ea51099d84f1b4f Mon Sep 17 00:00:00 2001 From: Imanol Fernandez Date: Fri, 20 Oct 2017 19:30:14 +0200 Subject: [PATCH] Update offscreen_gl_context to v0.12 --- Cargo.lock | 37 +++++++++++++++-------------- components/canvas/Cargo.toml | 2 +- components/canvas/gl_context.rs | 7 +++++- components/canvas_traits/Cargo.toml | 2 +- components/script/Cargo.toml | 2 +- 5 files changed, 28 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e5e049f85d5..2b94c0dcec1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -311,11 +311,11 @@ dependencies = [ "cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "webrender 0.52.1 (git+https://github.com/servo/webrender)", "webrender_api 0.52.1 (git+https://github.com/servo/webrender)", @@ -332,7 +332,7 @@ dependencies = [ "malloc_size_of 0.0.1", "malloc_size_of_derive 0.0.1", "nonzero 0.0.1", - "offscreen_gl_context 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "webrender_api 0.52.1 (git+https://github.com/servo/webrender)", @@ -370,7 +370,7 @@ name = "cgl" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -477,7 +477,7 @@ version = "0.0.1" dependencies = [ "euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", - "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", @@ -790,7 +790,7 @@ dependencies = [ "compositing 0.0.1", "devtools 0.0.1", "euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "glutin_app 0.0.1", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "libservo 0.0.1", @@ -1174,7 +1174,7 @@ dependencies = [ [[package]] name = "gleam" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gl_generator 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1194,7 +1194,7 @@ dependencies = [ "compositing 0.0.1", "euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "libservo 0.0.1", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1403,7 +1403,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1684,7 +1684,7 @@ dependencies = [ "euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", - "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "layout_thread 0.0.1", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2158,7 +2158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "offscreen_gl_context" -version = "0.11.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2166,11 +2166,12 @@ dependencies = [ "euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2618,7 +2619,7 @@ dependencies = [ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "half 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2640,7 +2641,7 @@ dependencies = [ "net_traits 0.0.1", "nonzero 0.0.1", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2921,7 +2922,7 @@ dependencies = [ "cmake 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3634,7 +3635,7 @@ dependencies = [ "freetype 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "gamma-lut 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3884,7 +3885,7 @@ dependencies = [ "checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685" "checksum gif 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8a80d6fe9e52f637df9afd4779449a7be17c39cc9c35b01589bb833f956ba596" "checksum gl_generator 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0940975a4ca12b088d32b5d5134826c47d2e73de4b0b459b05244c01503eccbb" -"checksum gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "bf887141f0c2a83eae026cbf3fba74f0a5cb0f01d20e5cdfcd8c4ad39295be1e" +"checksum gleam 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d808f1f9f6a460139aae0f8809d38583fa1dac905255c9fe2c75893c579f5f6f" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" "checksum glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b280007fa9c7442cfd1e0b1addb8d1a59240267110e8705f8f7e2c7bfb7e2f72" "checksum gvr-sys 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e84ba5e13cd925de87b669475525f956f8e936e67ddb24fbb1a077d96bbe174c" @@ -3954,7 +3955,7 @@ dependencies = [ "checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" "checksum objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e4730aa1c64d722db45f7ccc4113a3e2c465d018de6db4d3e7dfe031e8c8a297" "checksum odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "c3df9b730298cea3a1c3faa90b7e2f9df3a9c400d0936d6015e6165734eefcba" -"checksum offscreen_gl_context 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ee0b17158af8e1fb6c8f8df048bd3f1c4b78bebbf4883f189e2a83ce853ce9bd" +"checksum offscreen_gl_context 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2211cc1c0513c664d64f1e2a15d9d7ded52a90f115946e3b2acc7a651d8404f9" "checksum ogg 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7137bf02687385302f4c0aecd77cfce052b69f5b4ee937be778e125c62f67e30" "checksum ogg_metadata 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fc665717454399cba557c55ad226148996e9266ee291f8a37a98bb2cded0a490" "checksum open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3478ed1686bd1300c8a981a940abc92b06fac9cbef747f4c668d4e032ff7b842" diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index 8c56627bfcb..bbcd3cb0332 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -20,7 +20,7 @@ gleam = "0.4" ipc-channel = "0.9" log = "0.3.5" num-traits = "0.1.32" -offscreen_gl_context = { version = "0.11", features = ["serde", "osmesa"] } +offscreen_gl_context = { version = "0.12", features = ["serde", "osmesa"] } servo_config = {path = "../config"} webrender = {git = "https://github.com/servo/webrender"} webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/components/canvas/gl_context.rs b/components/canvas/gl_context.rs index ae7446e2eb5..8770e3d19d8 100644 --- a/components/canvas/gl_context.rs +++ b/components/canvas/gl_context.rs @@ -6,7 +6,8 @@ use canvas_traits::webgl::WebGLCommand; use compositing::compositor_thread::{CompositorProxy, self}; use euclid::Size2D; use gleam::gl; -use offscreen_gl_context::{ColorAttachmentType, GLContext, GLContextAttributes, GLContextDispatcher, GLLimits}; +use offscreen_gl_context::{ColorAttachmentType, GLContext, GLContextAttributes, GLContextDispatcher}; +use offscreen_gl_context::{GLLimits, GLVersion}; use offscreen_gl_context::{NativeGLContext, NativeGLContextHandle, NativeGLContextMethods}; use offscreen_gl_context::{OSMesaContext, OSMesaContextHandle}; use std::sync::{Arc, Mutex}; @@ -50,6 +51,7 @@ impl GLContextFactory { attributes, ColorAttachmentType::Texture, gl::GlType::default(), + GLVersion::Major(2), Some(handle), dispatcher); ctx.map(GLContextWrapper::Native) @@ -59,6 +61,7 @@ impl GLContextFactory { attributes, ColorAttachmentType::Texture, gl::GlType::default(), + GLVersion::Major(2), Some(handle), None); ctx.map(GLContextWrapper::OSMesa) @@ -76,6 +79,7 @@ impl GLContextFactory { attributes, ColorAttachmentType::Texture, gl::GlType::default(), + GLVersion::Major(2), None, None); ctx.map(GLContextWrapper::Native) @@ -85,6 +89,7 @@ impl GLContextFactory { attributes, ColorAttachmentType::Texture, gl::GlType::default(), + GLVersion::Major(2), None, None); ctx.map(GLContextWrapper::OSMesa) diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml index 9e8be669ddf..bdd486c0f7e 100644 --- a/components/canvas_traits/Cargo.toml +++ b/components/canvas_traits/Cargo.toml @@ -17,7 +17,7 @@ lazy_static = "0.2" malloc_size_of = { path = "../malloc_size_of" } malloc_size_of_derive = { path = "../malloc_size_of_derive" } nonzero = {path = "../nonzero"} -offscreen_gl_context = { version = "0.11", features = ["serde"] } +offscreen_gl_context = { version = "0.12", features = ["serde"] } serde = "1.0" servo_config = {path = "../config"} webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 006bf1d1193..0489c67c762 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -64,7 +64,7 @@ msg = {path = "../msg"} net_traits = {path = "../net_traits"} nonzero = {path = "../nonzero"} num-traits = "0.1.32" -offscreen_gl_context = { version = "0.11", features = ["serde"] } +offscreen_gl_context = { version = "0.12", features = ["serde"] } open = "1.1.1" parking_lot = "0.4" phf = "0.7.18"