diff options
| author | Imanol Fernandez <mortimergoro@gmail.com> | 2017-10-20 19:30:14 +0200 |
|---|---|---|
| committer | Imanol Fernandez <mortimergoro@gmail.com> | 2017-10-20 19:30:14 +0200 |
| commit | a721b6824947fac49392b4a07ea51099d84f1b4f (patch) | |
| tree | 719614c0edcbc42bae023d58a85a326e20303104 /components/canvas | |
| parent | d4bdb8b2936d3b47841103fd5c843860ef5c7474 (diff) | |
| download | servo-a721b6824947fac49392b4a07ea51099d84f1b4f.tar.gz servo-a721b6824947fac49392b4a07ea51099d84f1b4f.zip | |
Update offscreen_gl_context to v0.12
Diffstat (limited to 'components/canvas')
| -rw-r--r-- | components/canvas/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/canvas/gl_context.rs | 7 |
2 files changed, 7 insertions, 2 deletions
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) |