Auto merge of #26197 - jdm:preview-runtime, r=Manishearth

Use preview OpenXR runtime

Fixes #26184.
This commit is contained in:
bors-servo 2020-04-15 23:19:25 -04:00 committed by GitHub
commit 16230ee279
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View file

@ -9,7 +9,7 @@
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
<PackageDependency Name="Microsoft.WindowsMixedReality.Runtime" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" MinVersion="0.0.1.0" />
<PackageDependency Name="Microsoft.WindowsMixedReality.Runtime" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" MinVersion="100.2004.3007.0"/>
</Dependencies>
<Resources>
<Resource Language="x-generate" />

View file

@ -109,6 +109,7 @@ const char *prompt_input(const char *message, const char *default,
Servo::Servo(hstring url, hstring args, GLsizei width, GLsizei height,
float dpi, ServoDelegate &aDelegate)
: mWindowHeight(height), mWindowWidth(width), mDelegate(aDelegate) {
SetEnvironmentVariableA("PreviewRuntimeEnabled", "1");
capi::CInitOptions o;
hstring defaultPrefs = L" --pref dom.webxr.enabled --devtools";