Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update offscreen_gl_context to v0.12
  • Loading branch information
MortimerGoro committed Oct 20, 2017
1 parent d4bdb8b commit a721b68
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 22 deletions.
37 changes: 19 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion components/canvas/Cargo.toml
Expand Up @@ -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"]}
7 changes: 6 additions & 1 deletion components/canvas/gl_context.rs
Expand Up @@ -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};
Expand Down Expand Up @@ -50,6 +51,7 @@ impl GLContextFactory {
attributes,
ColorAttachmentType::Texture,
gl::GlType::default(),
GLVersion::Major(2),
Some(handle),
dispatcher);
ctx.map(GLContextWrapper::Native)
Expand All @@ -59,6 +61,7 @@ impl GLContextFactory {
attributes,
ColorAttachmentType::Texture,
gl::GlType::default(),
GLVersion::Major(2),
Some(handle),
None);
ctx.map(GLContextWrapper::OSMesa)
Expand All @@ -76,6 +79,7 @@ impl GLContextFactory {
attributes,
ColorAttachmentType::Texture,
gl::GlType::default(),
GLVersion::Major(2),
None,
None);
ctx.map(GLContextWrapper::Native)
Expand All @@ -85,6 +89,7 @@ impl GLContextFactory {
attributes,
ColorAttachmentType::Texture,
gl::GlType::default(),
GLVersion::Major(2),
None,
None);
ctx.map(GLContextWrapper::OSMesa)
Expand Down
2 changes: 1 addition & 1 deletion components/canvas_traits/Cargo.toml
Expand Up @@ -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"]}
2 changes: 1 addition & 1 deletion components/script/Cargo.toml
Expand Up @@ -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"
Expand Down

0 comments on commit a721b68

Please sign in to comment.