diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-05-10 00:04:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-10 00:04:20 -0400 |
| commit | b1b47d8046ada8f6c7dc2da65ab68018b0676b0e (patch) | |
| tree | fe9d4bf68f0bd176a0aae66c9c0f907656de3660 /components | |
| parent | 58ebaccf95a09f4ad36b3ed5afb44f5f79b7f4d2 (diff) | |
| parent | a690d6ffa78af861c7dbaa7daad4448c8fa9d3e6 (diff) | |
| download | servo-b1b47d8046ada8f6c7dc2da65ab68018b0676b0e.tar.gz servo-b1b47d8046ada8f6c7dc2da65ab68018b0676b0e.zip | |
Auto merge of #22856 - jdm:angle, r=paulrouget
Add optional ANGLE support to glutin port
Supporting ANGLE in Servo has two important benefits:
* we can actually run Servo instances on our Windows CI machines, which gives us more confidence that we're not breaking it
* we can continue to use OpenGL on devices like the Hololens, rather than creating platform-specific graphical backends
<!-- 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/22856)
<!-- Reviewable:end -->
Diffstat (limited to 'components')
| -rw-r--r-- | components/config/opts.rs | 11 | ||||
| -rw-r--r-- | components/script/Cargo.toml | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/components/config/opts.rs b/components/config/opts.rs index 8a8a58aeb03..f5ff22070e5 100644 --- a/components/config/opts.rs +++ b/components/config/opts.rs @@ -76,6 +76,10 @@ pub struct Opts { pub load_webfonts_synchronously: bool, pub headless: bool, + + /// Use ANGLE to create the GL context (Windows-only). + pub angle: bool, + pub hard_fail: bool, /// True if we should bubble intrinsic widths sequentially (`-b`). If this is true, then @@ -558,6 +562,7 @@ pub fn default_opts() -> Opts { gc_profile: false, load_webfonts_synchronously: false, headless: false, + angle: false, hard_fail: true, bubble_inline_sizes_separately: false, show_debug_fragment_borders: false, @@ -667,6 +672,11 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult { ); opts.optflag("z", "headless", "Headless mode"); opts.optflag( + "", + "angle", + "Use ANGLE to create a GL context (Windows-only)", + ); + opts.optflag( "f", "hard-fail", "Exit on thread failure instead of displaying about:failure", @@ -998,6 +1008,7 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult { gc_profile: debug_options.gc_profile, load_webfonts_synchronously: debug_options.load_webfonts_synchronously, headless: opt_match.opt_present("z"), + angle: opt_match.opt_present("angle"), hard_fail: opt_match.opt_present("f") && !opt_match.opt_present("F"), bubble_inline_sizes_separately: bubble_inline_sizes_separately, profile_script_events: debug_options.profile_script_events, diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index ba760816374..85e504027f2 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -115,4 +115,4 @@ webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]} webvr_traits = {path = "../webvr_traits"} [target.'cfg(not(target_os = "ios"))'.dependencies] -mozangle = "0.1" +mozangle = "0.2" |