Skip to content
Permalink
Browse files

Disable WGL for Windows arm64.

  • Loading branch information...
jdm committed May 30, 2019
1 parent b19cd5e commit 385b46cff735db4bb1d4b395a5d872a006a987aa
@@ -15,6 +15,7 @@ azure_backend = ["azure"]
default = ["azure_backend"]
webgl_backtrace = ["canvas_traits/webgl_backtrace"]
raqote_backend = ["raqote"]
no_wgl = ["offscreen_gl_context/no_wgl"]

[dependencies]
azure = {git = "https://github.com/servo/rust-azure", optional = true}
@@ -13,6 +13,7 @@ path = "lib.rs"
[features]
azure_backend = ["canvas/azure_backend"]
raqote_backend = ["canvas/raqote_backend"]
no_wgl = ["canvas/no_wgl"]

[dependencies]
background_hang_monitor = { path = "../background_hang_monitor"}
@@ -20,6 +20,7 @@ googlevr = ["webvr/googlevr"]
js_backtrace = ["script/js_backtrace"]
max_log_level = ["log/release_max_level_info"]
native-bluetooth = ["bluetooth/native-bluetooth"]
no_wgl = ["canvas/no_wgl"]
raqote_backend = ["canvas/raqote_backend"]
webrender_debugger = ["webrender/debugger"]
no_static_freetype = ["webrender/no_static_freetype"]
@@ -382,7 +382,9 @@ def windows_arm64():
.with_treeherder("Windows arm64")
.with_script(
"python mach build --dev --libsimpleservo \
--target aarch64-pc-windows-msvc --features raqote_backend",
--target aarch64-pc-windows-msvc \
--with-raqote \
--without-wgl",
)
.find_or_create("build.windows_arm64_dev." + CONFIG.task_id())
)
@@ -36,6 +36,7 @@ js_backtrace = ["libservo/js_backtrace"]
max_log_level = ["log/release_max_level_info"]
native-bluetooth = ["libservo/native-bluetooth"]
no_static_freetype = ["libservo/no_static_freetype"]
no_wgl = ["libservo/no_wgl"]
oculusvr = ["libservo/oculusvr"]
raqote_backend = ["libservo/raqote_backend"]
webdriver = ["libservo/webdriver"]
@@ -30,6 +30,7 @@ googlevr = ["simpleservo/googlevr"]
js_backtrace = ["simpleservo/js_backtrace"]
max_log_level = ["simpleservo/max_log_level"]
native-bluetooth = ["simpleservo/native-bluetooth"]
no_wgl = ["simpleservo/no_wgl"]
oculusvr = ["simpleservo/oculusvr"]
raqote_backend = ["simpleservo/raqote_backend"]
unstable = ["simpleservo/unstable"]
@@ -197,10 +197,12 @@ class MachCommands(CommandBase):
default=None,
action='store_true',
help='Build with frame pointer enabled, used by the background hang monitor.')
@CommandArgument('--with-raqote', default=None, action='store_true')
@CommandArgument('--without-wgl', default=None, action='store_true')
def build(self, target=None, release=False, dev=False, jobs=None,
features=None, android=None, magicleap=None, no_package=False, verbose=False, very_verbose=False,
debug_mozjs=False, params=None, with_debug_assertions=False,
libsimpleservo=False, with_frame_pointer=False):
libsimpleservo=False, with_frame_pointer=False, with_raqote=False, without_wgl=False):

opts = params or []

@@ -291,6 +293,12 @@ def build(self, target=None, release=False, dev=False, jobs=None,
env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C force-frame-pointers=yes"
features += ["profilemozjs"]

if with_raqote:
features += ["raqote_backend"]

if without_wgl:
features += ["no_wgl"]

if self.config["build"]["webgl-backtrace"]:
features += ["webgl-backtrace"]
if self.config["build"]["dom-backtrace"]:

0 comments on commit 385b46c

Please sign in to comment.
You can’t perform that action at this time.