mirror of
https://github.com/servo/servo.git
synced 2025-07-10 00:43:39 +01:00
Auto merge of #18973 - MortimerGoro:offscreen_v12, r=jdm
Update offscreen_gl_context to v0.12 <!-- Please describe your changes on the following line: --> Update offscreen_gl_context to v0.12. Includes: - Support for OpenGL version selection. It's required for WebGL 2. - Support for iOS EAGLContext. WebGL should work out of the box once Servo is fully built on iOS. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [x] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18973) <!-- Reviewable:end -->
This commit is contained in:
commit
c0a6b59fdf
5 changed files with 28 additions and 22 deletions
|
@ -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"]}
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"]}
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue