mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
28eae10bc7
- Bug 1251797 - Don't fault struct out of rule tree if all of the potential physical property destinations already have a winning value in the cascade. r=heycam (b64f25ae75)
- Bug 1257688 part 0: Add an "IsLegacyBox" accessor to nsFlexContainerFrame, to enable special handling of display:-webkit-box & display:-webkit-inline-box. r=mats (f728070412)
- Bug 1257688 part 1: Change "-webkit-box-pack" & "-webkit-box-align" to alias their -moz equivalents, & change nsFlexContainerFrame to respect them in a -webkit-box. r=mats (fda7e641bb)
- Bug 1174248 - Apply RTL resizer failure only to GTK2. r=karlt (5f264b52bc)
- Bug 1234941 part 1: Add reftests for "-webkit-box" rendering, with -webkit-box-orient unset. r=heycam (bbdb2737a0)
- Bug 1234941 part 2: Add reftests for "-webkit-box" rendering, with -webkit-box-orient:horizontal. r=heycam (815f24f010)
- Bug 1234941 part 3: Add reftests for "-webkit-box" rendering, with -webkit-box-orient:vertical. r=heycam (a4f71266b9)
- Bug 1257688 part 2: Enable "-webkit-box-pack: justify" sections of -webkit-box reftests, & fix reference cases to use 'space-between' (the modern equivalent). (no review) (7641615ec0)
- Bug 1257688 part 3: Change "-webkit-box-ordinal-group" to alias its -moz equivalent, & change nsFlexContainerFrame to respect it in a -webkit-box. r=mats (90797264fe)
- Bug 1257688 part 4: Add reftests for -webkit-box-ordinal-group inside of display:-webkit-box. r=mats (7623b7a5dd)
- Bug 1257688 part 5: Change "-webkit-box-flex" to alias its -moz equivalent, & change nsFlexContainerFrame to use it instead of flex-shrink & flex-grow in a -webkit-box. r=mats (dabf0415f3)
- Bug 1257688 part 6: Add reftest for -webkit-box-flex inside of display:-webkit-box. r=mats (06d1384d0b)
- Bug 1257688 followup: Fix typo in <title>s in webkit-box-ordinal-group reftests. (no review, test-metadata only) (b8753af073)
- Bug 1262049 part 1: Back out bug 1208344 in its entirety, and mark -webkit-box-orient:vertical reftests as failing (for now). (no review) (fd3890a164)
- Bug 1262049 part 2: Add -webkit-box-orient & -webkit-box-direction as aliases for -moz versions, in the style system (but not yet honored by flexbox layout). r=mats (33e137427f)
- Bug 1262049 part 3: Refactor FlexboxAxisTracker constructor to take pointer to nsFlexContainerFrame. r=mats (0e9a26b85d)
- Bug 1262049 part 4: Refactor some of FlexboxAxisTracker constructor's logic into a helper method. r=mats (c298827ed2)
- Bug 1264837 Part 1 - Remove nsTextBoxFrameSuper. r=dholbert (dc64371da6)
- Bug 1264837 Part 2 - Remove nsColorControlFrameSuper. r=dholbert (166c5c13c3)
- Bug 1264837 Part 3 - Remove nsFormControlFrameSuper. r=dholbert (70c4c13c79)
- Bug 1264837 Part 4 - Remove nsImageControlFrameSuper. r=dholbert (68af4648e6)
- Bug 1264837 Part 5 - Remove nsFlexContainerFrameSuper. r=dholbert (ef7b1a912e)
- Bug 1261553 - Don't return from OnVisibilityChanged implementations without calling the superclass implementation. r=mstange (033d4cdf72)
- Bug 1264837 Part 6 - Remove ImageFrameSuper. r=dholbert (cbf002ba56)
- Bug 1264837 Part 7 - Remove nsInlineFrameBase r=dholbert (42e277593f)
- Bug 1262049 part 5: Honor -webkit-box-orient & -webkit-box-direction when determining axes for a -webkit-box flexbox. r=mats (a4f03722ed)
- Bug 1262049 part 6: Add reftest for -webkit-box-direction. (no review) (d41936d107)
- Bug 1266248 part 1: Rename MapSinglePropertyInto() args, to make src-vs-target distinctions clearer. r=heycam (2d46c21c34)
- Bug 1266248 part 2: Add assertion to verify that MapSinglePropertyInto() isn't called with a logical target-property. r=heycam (c51b780a2b)
- Bug 1264837 Part 8 - Remove nsPluginFrameSuper. r=dholbert (615738f0f0)
- Bug 1264837 Part 9 - Remove nsRubyBaseFrameSuper. r=dholbert (0fb30cf0a3)
- Bug 1264837 Part 10 - Remove nsRubyContentFrameSuper. r=dholbert (df02f9983c)
- Bug 1264837 Part 11 - Remove nsRubyFrameSuper. r=dholbert (684a20009b)
- Bug 1264837 Part 12 - Remove nsRubyTextContainerFrameSuper. r=dholbert (4961565c4b)
- Bug 1264837 Part 13 - Remove nsRubyTextFrameSuper. r=dholbert (aa9e863378)
- bits of 1261230 (cffbacd922)
- Bug 1264837 Part 14 - Remove nsSubDocumentFrameSuper. r=dholbert (2ddc0b2028)
- Bug 1264837 Part 15 - Remove nsVideoFrameBase r=dholbert (c1246fd0bc)
- Bug 1264837 Part 16 - Remove ViewportFrame::Super. r=dholbert (dff457b117)
- Bug 1264837 Part 17 - Remove nsSVGAFrameBase. r=dholbert (0df66e92c5)
- Bug 1253590, part 1 - Generalize AutoReferenceLoopDetector to allow it to be used to limit reference chain lengths. r=longsonr (e1673d2e9e)
- Bug 1253590, part 2 - Use the new AutoReferenceLimiter helper to limit clip path reference chain lengths. r=longsonr (4e03ec9001)
- Bug 1253590, part 3 - Crashtest for long clipPath reference chains. r=longsonr (c4da0e1dc4)
- Bug 1253590, part 4 - Follow-up to return the correct type. r=bustage (61c7fd965a)
- Bug 1264837 Part 18 - Remove nsSVGClipPathFrameBase. r=dholbert (ec78340590)
- Bug 1264837 Part 19 - Remove nsSVGContainerFrameBase. r=dholbert (57c5c44826)
- Bug 1264837 Part 20 - Remove nsSVGFilterFrameBase. r=dholbert (5f41a15a86)
- Bug 1264837 Part 21 - Remove nsSVGForeignObjectFrameBase. r=dholbert (c9aeb556ce)
- Bug 1264837 Part 22 - Remove nsSVGGenericContainerFrameBase. r=dholbert (bd4e21975d)
- Bug 1264837 Part 23 - Remove nsSVGGFrameBase. r=dholbert (bed40424fd)
- Bug 1264837 Part 24 - Remove nsSVGGradientFrameBase. r=dholbert (a9a7d3e0d4)
- Bug 1264837 Part 25 - Remove nsSVGLinearGradientFrameBase. r=dholbert (a48ed6b6b2)
- Bug 1264837 Part 26 - Remove nsSVGRadialGradientFrameBase. r=dholbert (76181ad3b2)
- Bug 1264837 Part 27 - Remove nsSVGImageFrameBase. r=dholbert (5aaa32517d)
- Bug 1242256 - ensure images in patterns and masks animate properly. r=jwatt,seth (cc40ee9520)
- Bug 1264837 Part 28 - Remove nsSVGInnerSVGFrameBase. r=dholbert (04b9d9b5fb)
- Bug 1264837 Part 29 - Remove nsSVGMarkerFrameBase. r=dholbert (bc28eca472)
- Bug 1264837 Part 30 - Remove nsSVGMarkerAnonChildFrameBase. r=dholbert (6898a93a31)
- Bug 1264837 Part 31 - Remove nsSVGMaskFrameBase. r=dholbert (26d0e7a5e1)
- Bug 1264837 Part 32 - Remove nsSVGOuterSVGFrameBase. r=dholbert (a473ae8be3)
- Bug 1264837 Part 33 - Remove nsSVGOuterSVGAnonChildFrameBase. r=dholbert (8c6cca5e9b)
- Bug 1264837 Part 34 - Remove nsSVGPaintServerFrameBase. r=dholbert (eab458bfab)
- Bug 1264837 Part 35 - Remove nsSVGPathGeometryFrameBase. r=dholbert (e5245d2be0)
- Bug 1264837 Part 36 - Remove nsSVGPatternFrameBase. r=dholbert (2df37d4056)
- Bug 1264837 Part 37 - Remove nsSVGStopFrameBase. r=dholbert (e367dba151)
- Bug 1264837 Part 38 - Remove nsSVGSwitchFrameBase. r=dholbert (7ffe7a731a)
- Bug 1264837 Part 39 - Remove nsSVGUseFrameBase. r=dholbert (b4445728e3)
- Bug 1264837 Part 40 - Remove SVGFEContainerFrameBase. r=dholbert (ee08ef9caf)
- Bug 1264837 Part 41 - Remove SVGFEImageFrameBase. r=dholbert (010f79b418)
- Bug 1264837 Part 42 - Remove SVGFELeafFrameBase. r=dholbert (949aeba02d)
- Bug 1264837 Part 44 - Remove SVGTextFrameBase. r=dholbert (bfd0603d44)
- Bug 1264837 Part 45 - Remove SVGViewFrameBase. r=dholbert (151f3c95b2)
- Bug 1265591 patch 1 - Remove Internal/External versions of ReconstructStyleData. r=heycam (a91f96e3b3)
- Bug 1265591 patch 2 - Rename nsIPresShell::ReconstructStyleData to RestyleForCSSRuleChanges. r=heycam (8ad2bc3021)
- Bug 1265591 patch 3 - Make the comment describing RestyleForCSSRuleChanges match reality. r=heycam (2ef053622d)
- Bug 1251150. Add crash annotations if image visibility is re-entering. r=mats (975a3e98d7)
- Bug 1261554 (Part 1) - Prepare for implementing in-displayport visibility tracking. r=mstange (b139489249)
- Bug 1261554 (Part 2) - Mark frames which are added to the display list when painting to the window as having Visibility::IN_DISPLAYPORT. r=mstange (4c8185bf0e)
- Bug 1259529 - Clean up the APZ minimap rendering code a bit. No functional changes. r=BenWa (9b99c27777)
- Bug 1256532 - Show the critical displayport in the APZ minimap as well. r=BenWa (9b131616a0)
- Bug 1251886 - Correct inputFrameID selection when using e10s r=daoshengmu (9e042f6af3)
- Bug 1261554 (Part 3) - Visualize Visibility::IN_DISPLAYPORT regions in the APZ minimap visibility debugger. r=botond (f9b72319e1)
- Bug 1261554 (Followup) - Fix memory reporting for PresShell::mVisibleRegions. r=me (6fc953c1de)
- Bug 1259529 - Ensure that the APZ minimap for subframes remains scaled to the visible portion of the composition bounds. r=BenWa (9f156773cf)
- Bug 1251150. Back out crash annotations used to try to diagnose crash. (db6ba80214)
- missing bits of Bug 1258476 - Optimize CreateRangePaintInfo by generating display lists for the minimum amount of range subtrees rather than for the range common ancestor. r=tn (2ded969082)
- Bug 1237821. Use displayport getter for image visibility in the (unused) display list builder based image visibility code. r=botond (a634182065)
- Bug 1253995 - Display stale image in nsImageFrame if we have a new src but haven't decoded it yet - r=seth (6add357448)
- Bug 1261703. When moving flex frame, position its view as well as any child views. r=dholbert (abd586f55f)
- bug 1246772 - work around x87 floating point truncation issues in gecko r=dholbert (de38865a9f)
- missing bits of 1202908 (4a254234f7)
- Bug 1249134: Remove support for -webkit-appearance as an alias for -moz-appearance, since the two prefixed properties behave differently in practice. r=heycam (7fd6826fb0)
- Bug 1249937 - Rename LayerComposite::SetShadowTransform to SetShadowBaseTransform. r=botond (c91f175b8d)
- Bug 1260335 - On perspective ContainerLayers, the clip deferred from their child layer needs to be affected by the perspective layer's async transforms. r=botond (ee1a19e113)
- Bug 1260335 - Add a comment that explains why the perspective child can't have more than one frame metrics. r=mattwoodrow (639d9ede24)
- Bug 1148978 - Remove plugin window update composition deferment. r=mattwoodrow (01e7da3570)
- Bug 1263515 - Destroy the compositor earlier in RecvWillStop when it still has a valid widget. r=jnicol (c14135bf7c)
- Bug 1258440 - Don't attempt to hide plugin windows when switching trees if the previous remote layer tree didn't contain plugin windows. Fixes a tpaint regression. r=mconley (929db2fdf2)
- Bug 1260976 - Make nsTransitionManager use Keyframe objects to set up transitions; r=heycam (3b8ef91fe9)
- Bug 1265611 - Make TransitionProperty() and ToValue() safe when mProperties is not set; r=heycam (37d234aad4)
- Bug 1259675 - Clean up InternalTransitionEvent r=masayuki (f6526d4dfa)
- Bug 1260976 - Remove some references to properties within nsTransitionManager; r=heycam (6c0f84fb17)
- Bug 1182856 - Part 4: Refactor code in nsTransitionManager::StyleContextChanged(). r=heycam (ee0f4d76fd)
- Bug 1182856 - Part 5: Avoid unnecessary transition update if display:none. r=heycam (5e01fff5cc)
- Bug 1182856 - Part 6: Revise tests for display:none in test_transitions.html. r=heycam (ac2dfe8e47)
- Bug 1182856 - Part 7: Test. r=cam (2aed7d5ae6)
- Bug 1265611 - Don't trigger transitions for properties that are disabled; r=heycam (dabf201421)
- Bug 1247533 - Annotate intentional switch fallthrough to suppress -Wimplicit-fallthrough warning in layout/style/. r=dbaron (a0b748bea2)
- Bug 1264830 - Part 1: Add an nsStyleAutoArray array type, similar to AutoTArray<...,1> but memmovable. r=bholley (ad4eb0692c)
- Bug 1264830 - Part 2: Change nsStyleImageLayers::mLayers to use nsStyleAutoArray. r=bholley (963a9e4033)
- Bug 1264830 - Part 3: Change nsStyleDisplay::{mTransitions,mAnimations} to use nsStyleAutoArray. r=bholley (396812da9d)
- Bug 1264830 - Part 4: Change nsStyleDisplay::mWillChange to use nsTArray. r=bholley (7dead8570f)
- Bug 1264830 - Part 5: Require all style structs be memmovable. r=bholley (8fdd844d1c)
- Bug 1244628: compare nsStyleImageLayers::mAttachmentCount in nsStyleImageLayers::CalcDifference. r=dbaron. (11e2bb1665)
- Bug 1252739 - nsStyleImageLayers::HasLayerWithImage should return true when we have mask-image:<element-reference> | <gradient>; r=dbaron (904b65a0e5)
- cleanup empty line (8263e0793e)
- Bug 1261392 - Define gettid for all Linux builds. r=bgirard (781ae95acc)
675 lines
20 KiB
C++
675 lines
20 KiB
C++
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include <math.h>
|
|
|
|
#include "prlink.h"
|
|
#include "prmem.h"
|
|
#include "prenv.h"
|
|
#include "gfxPrefs.h"
|
|
#include "nsString.h"
|
|
#include "mozilla/Preferences.h"
|
|
#include "mozilla/TimeStamp.h"
|
|
|
|
#include "mozilla/gfx/Quaternion.h"
|
|
|
|
#ifdef XP_WIN
|
|
#include "../layers/d3d11/CompositorD3D11.h"
|
|
#endif
|
|
|
|
#include "gfxVROculus.h"
|
|
|
|
#ifndef M_PI
|
|
# define M_PI 3.14159265358979323846
|
|
#endif
|
|
|
|
using namespace mozilla::gfx;
|
|
using namespace mozilla::gfx::impl;
|
|
|
|
namespace {
|
|
|
|
#ifdef OVR_CAPI_LIMITED_MOZILLA
|
|
static pfn_ovr_Initialize ovr_Initialize = nullptr;
|
|
static pfn_ovr_Shutdown ovr_Shutdown = nullptr;
|
|
static pfn_ovr_GetTimeInSeconds ovr_GetTimeInSeconds = nullptr;
|
|
static pfn_ovr_GetHmdDesc ovr_GetHmdDesc = nullptr;
|
|
|
|
static pfn_ovr_Create ovr_Create = nullptr;
|
|
static pfn_ovr_Destroy ovr_Destroy = nullptr;
|
|
|
|
static pfn_ovr_RecenterPose ovr_RecenterPose = nullptr;
|
|
static pfn_ovr_GetTrackingState ovr_GetTrackingState = nullptr;
|
|
static pfn_ovr_GetPredictedDisplayTime ovr_GetPredictedDisplayTime = nullptr;
|
|
static pfn_ovr_GetFovTextureSize ovr_GetFovTextureSize = nullptr;
|
|
static pfn_ovr_GetRenderDesc ovr_GetRenderDesc = nullptr;
|
|
|
|
static pfn_ovr_DestroySwapTextureSet ovr_DestroySwapTextureSet = nullptr;
|
|
static pfn_ovr_SubmitFrame ovr_SubmitFrame = nullptr;
|
|
|
|
#ifdef XP_WIN
|
|
static pfn_ovr_CreateSwapTextureSetD3D11 ovr_CreateSwapTextureSetD3D11 = nullptr;
|
|
#endif
|
|
static pfn_ovr_CreateSwapTextureSetGL ovr_CreateSwapTextureSetGL = nullptr;
|
|
|
|
#ifdef HAVE_64BIT_BUILD
|
|
#define BUILD_BITS 64
|
|
#else
|
|
#define BUILD_BITS 32
|
|
#endif
|
|
|
|
#define OVR_PRODUCT_VERSION 0
|
|
#define OVR_MAJOR_VERSION 8
|
|
#define OVR_MINOR_VERSION 0
|
|
|
|
static bool
|
|
InitializeOculusCAPI()
|
|
{
|
|
static PRLibrary *ovrlib = nullptr;
|
|
|
|
if (!ovrlib) {
|
|
nsTArray<nsCString> libSearchPaths;
|
|
nsCString libName;
|
|
nsCString searchPath;
|
|
|
|
#if defined(_WIN32)
|
|
static const char dirSep = '\\';
|
|
#else
|
|
static const char dirSep = '/';
|
|
#endif
|
|
|
|
#if defined(_WIN32)
|
|
static const int pathLen = 260;
|
|
searchPath.SetCapacity(pathLen);
|
|
int realLen = ::GetSystemDirectoryA(searchPath.BeginWriting(), pathLen);
|
|
if (realLen != 0 && realLen < pathLen) {
|
|
searchPath.SetLength(realLen);
|
|
libSearchPaths.AppendElement(searchPath);
|
|
}
|
|
libName.AppendPrintf("LibOVRRT%d_%d_%d.dll", BUILD_BITS, OVR_PRODUCT_VERSION, OVR_MAJOR_VERSION);
|
|
#elif defined(__APPLE__)
|
|
searchPath.Truncate();
|
|
searchPath.AppendPrintf("/Library/Frameworks/LibOVRRT_%d.framework/Versions/%d", OVR_PRODUCT_VERSION, OVR_MAJOR_VERSION);
|
|
libSearchPaths.AppendElement(searchPath);
|
|
|
|
if (PR_GetEnv("HOME")) {
|
|
searchPath.Truncate();
|
|
searchPath.AppendPrintf("%s/Library/Frameworks/LibOVRRT_%d.framework/Versions/%d", PR_GetEnv("HOME"), OVR_PRODUCT_VERSION, OVR_MAJOR_VERSION);
|
|
libSearchPaths.AppendElement(searchPath);
|
|
}
|
|
// The following will match the va_list overload of AppendPrintf if the product version is 0
|
|
// That's bad times.
|
|
//libName.AppendPrintf("LibOVRRT_%d", OVR_PRODUCT_VERSION);
|
|
libName.Append("LibOVRRT_");
|
|
libName.AppendInt(OVR_PRODUCT_VERSION);
|
|
#else
|
|
libSearchPaths.AppendElement(nsCString("/usr/local/lib"));
|
|
libSearchPaths.AppendElement(nsCString("/usr/lib"));
|
|
libName.AppendPrintf("libOVRRT%d_%d.so.%d", BUILD_BITS, OVR_PRODUCT_VERSION, OVR_MAJOR_VERSION);
|
|
#endif
|
|
|
|
// If the pref is present, we override libName
|
|
nsAdoptingCString prefLibPath = mozilla::Preferences::GetCString("dom.vr.ovr_lib_path");
|
|
if (prefLibPath && prefLibPath.get()) {
|
|
libSearchPaths.InsertElementsAt(0, 1, prefLibPath);
|
|
}
|
|
|
|
nsAdoptingCString prefLibName = mozilla::Preferences::GetCString("dom.vr.ovr_lib_name");
|
|
if (prefLibName && prefLibName.get()) {
|
|
libName.Assign(prefLibName);
|
|
}
|
|
|
|
// search the path/module dir
|
|
libSearchPaths.InsertElementsAt(0, 1, nsCString());
|
|
|
|
// If the env var is present, we override libName
|
|
if (PR_GetEnv("OVR_LIB_PATH")) {
|
|
searchPath = PR_GetEnv("OVR_LIB_PATH");
|
|
libSearchPaths.InsertElementsAt(0, 1, searchPath);
|
|
}
|
|
|
|
if (PR_GetEnv("OVR_LIB_NAME")) {
|
|
libName = PR_GetEnv("OVR_LIB_NAME");
|
|
}
|
|
|
|
for (uint32_t i = 0; i < libSearchPaths.Length(); ++i) {
|
|
nsCString& libPath = libSearchPaths[i];
|
|
nsCString fullName;
|
|
if (libPath.Length() == 0) {
|
|
fullName.Assign(libName);
|
|
} else {
|
|
fullName.AppendPrintf("%s%c%s", libPath.BeginReading(), dirSep, libName.BeginReading());
|
|
}
|
|
|
|
ovrlib = PR_LoadLibrary(fullName.BeginReading());
|
|
if (ovrlib)
|
|
break;
|
|
}
|
|
|
|
if (!ovrlib) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
// was it already initialized?
|
|
if (ovr_Initialize)
|
|
return true;
|
|
|
|
#define REQUIRE_FUNCTION(_x) do { \
|
|
*(void **)&_x = (void *) PR_FindSymbol(ovrlib, #_x); \
|
|
if (!_x) { printf_stderr(#_x " symbol missing\n"); goto fail; } \
|
|
} while (0)
|
|
|
|
REQUIRE_FUNCTION(ovr_Initialize);
|
|
REQUIRE_FUNCTION(ovr_Shutdown);
|
|
REQUIRE_FUNCTION(ovr_GetTimeInSeconds);
|
|
REQUIRE_FUNCTION(ovr_GetHmdDesc);
|
|
|
|
REQUIRE_FUNCTION(ovr_Create);
|
|
REQUIRE_FUNCTION(ovr_Destroy);
|
|
|
|
REQUIRE_FUNCTION(ovr_RecenterPose);
|
|
REQUIRE_FUNCTION(ovr_GetTrackingState);
|
|
REQUIRE_FUNCTION(ovr_GetPredictedDisplayTime);
|
|
REQUIRE_FUNCTION(ovr_GetFovTextureSize);
|
|
REQUIRE_FUNCTION(ovr_GetRenderDesc);
|
|
|
|
REQUIRE_FUNCTION(ovr_DestroySwapTextureSet);
|
|
REQUIRE_FUNCTION(ovr_SubmitFrame);
|
|
#ifdef XP_WIN
|
|
REQUIRE_FUNCTION(ovr_CreateSwapTextureSetD3D11);
|
|
#endif
|
|
REQUIRE_FUNCTION(ovr_CreateSwapTextureSetGL);
|
|
|
|
#undef REQUIRE_FUNCTION
|
|
|
|
return true;
|
|
|
|
fail:
|
|
ovr_Initialize = nullptr;
|
|
return false;
|
|
}
|
|
|
|
#else
|
|
#include <OVR_Version.h>
|
|
// we're statically linked; it's available
|
|
static bool InitializeOculusCAPI()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
#endif
|
|
|
|
ovrFovPort
|
|
ToFovPort(const gfx::VRFieldOfView& aFOV)
|
|
{
|
|
ovrFovPort fovPort;
|
|
fovPort.LeftTan = tan(aFOV.leftDegrees * M_PI / 180.0);
|
|
fovPort.RightTan = tan(aFOV.rightDegrees * M_PI / 180.0);
|
|
fovPort.UpTan = tan(aFOV.upDegrees * M_PI / 180.0);
|
|
fovPort.DownTan = tan(aFOV.downDegrees * M_PI / 180.0);
|
|
return fovPort;
|
|
}
|
|
|
|
gfx::VRFieldOfView
|
|
FromFovPort(const ovrFovPort& aFOV)
|
|
{
|
|
gfx::VRFieldOfView fovInfo;
|
|
fovInfo.leftDegrees = atan(aFOV.LeftTan) * 180.0 / M_PI;
|
|
fovInfo.rightDegrees = atan(aFOV.RightTan) * 180.0 / M_PI;
|
|
fovInfo.upDegrees = atan(aFOV.UpTan) * 180.0 / M_PI;
|
|
fovInfo.downDegrees = atan(aFOV.DownTan) * 180.0 / M_PI;
|
|
return fovInfo;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
HMDInfoOculus::HMDInfoOculus(ovrSession aSession)
|
|
: VRHMDInfo(VRHMDType::Oculus, false)
|
|
, mSession(aSession)
|
|
, mInputFrameID(0)
|
|
{
|
|
MOZ_ASSERT(sizeof(HMDInfoOculus::DistortionVertex) == sizeof(VRDistortionVertex),
|
|
"HMDInfoOculus::DistortionVertex must match the size of VRDistortionVertex");
|
|
|
|
MOZ_COUNT_CTOR_INHERITED(HMDInfoOculus, VRHMDInfo);
|
|
|
|
mDeviceInfo.mDeviceName.AssignLiteral("Oculus VR HMD");
|
|
|
|
mDesc = ovr_GetHmdDesc(aSession);
|
|
|
|
mDeviceInfo.mSupportedSensorBits = VRStateValidFlags::State_None;
|
|
if (mDesc.AvailableTrackingCaps & ovrTrackingCap_Orientation) {
|
|
mDeviceInfo.mSupportedSensorBits |= VRStateValidFlags::State_Orientation;
|
|
}
|
|
if (mDesc.AvailableTrackingCaps & ovrTrackingCap_Position) {
|
|
mDeviceInfo.mSupportedSensorBits |= VRStateValidFlags::State_Position;
|
|
}
|
|
|
|
mDeviceInfo.mRecommendedEyeFOV[VRDeviceInfo::Eye_Left] = FromFovPort(mDesc.DefaultEyeFov[ovrEye_Left]);
|
|
mDeviceInfo.mRecommendedEyeFOV[VRDeviceInfo::Eye_Right] = FromFovPort(mDesc.DefaultEyeFov[ovrEye_Right]);
|
|
|
|
mDeviceInfo.mMaximumEyeFOV[VRDeviceInfo::Eye_Left] = FromFovPort(mDesc.MaxEyeFov[ovrEye_Left]);
|
|
mDeviceInfo.mMaximumEyeFOV[VRDeviceInfo::Eye_Right] = FromFovPort(mDesc.MaxEyeFov[ovrEye_Right]);
|
|
|
|
uint32_t w = mDesc.Resolution.w;
|
|
uint32_t h = mDesc.Resolution.h;
|
|
mDeviceInfo.mScreenRect.x = 0;
|
|
mDeviceInfo.mScreenRect.y = 0;
|
|
mDeviceInfo.mScreenRect.width = std::max(w, h);
|
|
mDeviceInfo.mScreenRect.height = std::min(w, h);
|
|
mDeviceInfo.mIsFakeScreen = true;
|
|
|
|
SetFOV(mDeviceInfo.mRecommendedEyeFOV[VRDeviceInfo::Eye_Left], mDeviceInfo.mRecommendedEyeFOV[VRDeviceInfo::Eye_Right], 0.01, 10000.0);
|
|
|
|
for (int i = 0; i < kMaxLatencyFrames; i++) {
|
|
mLastSensorState[i].Clear();
|
|
}
|
|
}
|
|
|
|
void
|
|
HMDInfoOculus::Destroy()
|
|
{
|
|
if (mSession) {
|
|
ovr_Destroy(mSession);
|
|
mSession = nullptr;
|
|
}
|
|
}
|
|
|
|
bool
|
|
HMDInfoOculus::SetFOV(const gfx::VRFieldOfView& aFOVLeft, const gfx::VRFieldOfView& aFOVRight,
|
|
double zNear, double zFar)
|
|
{
|
|
float pixelsPerDisplayPixel = 1.0;
|
|
ovrSizei texSize[2];
|
|
|
|
// get eye parameters and create the mesh
|
|
for (uint32_t eye = 0; eye < VRDeviceInfo::NumEyes; eye++) {
|
|
mDeviceInfo.mEyeFOV[eye] = eye == 0 ? aFOVLeft : aFOVRight;
|
|
mFOVPort[eye] = ToFovPort(mDeviceInfo.mEyeFOV[eye]);
|
|
|
|
ovrEyeRenderDesc renderDesc = ovr_GetRenderDesc(mSession, (ovrEyeType)eye, mFOVPort[eye]);
|
|
|
|
// As of Oculus 0.6.0, the HmdToEyeViewOffset values are correct and don't need to be negated.
|
|
mDeviceInfo.mEyeTranslation[eye] = Point3D(renderDesc.HmdToEyeViewOffset.x, renderDesc.HmdToEyeViewOffset.y, renderDesc.HmdToEyeViewOffset.z);
|
|
|
|
// note that we are using a right-handed coordinate system here, to match CSS
|
|
mDeviceInfo.mEyeProjectionMatrix[eye] = mDeviceInfo.mEyeFOV[eye].ConstructProjectionMatrix(zNear, zFar, true);
|
|
|
|
texSize[eye] = ovr_GetFovTextureSize(mSession, (ovrEyeType)eye, mFOVPort[eye], pixelsPerDisplayPixel);
|
|
}
|
|
|
|
// take the max of both for eye resolution
|
|
mDeviceInfo.mEyeResolution.width = std::max(texSize[VRDeviceInfo::Eye_Left].w, texSize[VRDeviceInfo::Eye_Right].w);
|
|
mDeviceInfo.mEyeResolution.height = std::max(texSize[VRDeviceInfo::Eye_Left].h, texSize[VRDeviceInfo::Eye_Right].h);
|
|
|
|
mConfiguration.hmdType = mDeviceInfo.mType;
|
|
mConfiguration.value = 0;
|
|
mConfiguration.fov[0] = aFOVLeft;
|
|
mConfiguration.fov[1] = aFOVRight;
|
|
|
|
return true;
|
|
}
|
|
|
|
void
|
|
HMDInfoOculus::FillDistortionConstants(uint32_t whichEye,
|
|
const IntSize& textureSize,
|
|
const IntRect& eyeViewport,
|
|
const Size& destViewport,
|
|
const Rect& destRect,
|
|
VRDistortionConstants& values)
|
|
{
|
|
}
|
|
|
|
bool
|
|
HMDInfoOculus::KeepSensorTracking()
|
|
{
|
|
// Oculus PC SDK 0.8 and newer enable tracking by default
|
|
return true;
|
|
}
|
|
|
|
void
|
|
HMDInfoOculus::NotifyVsync(const mozilla::TimeStamp& aVsyncTimestamp)
|
|
{
|
|
++mInputFrameID;
|
|
}
|
|
|
|
void
|
|
HMDInfoOculus::ZeroSensor()
|
|
{
|
|
ovr_RecenterPose(mSession);
|
|
}
|
|
|
|
VRHMDSensorState
|
|
HMDInfoOculus::GetSensorState()
|
|
{
|
|
VRHMDSensorState result;
|
|
double frameTiming = 0.0f;
|
|
if (gfxPrefs::VRPosePredictionEnabled()) {
|
|
frameTiming = ovr_GetPredictedDisplayTime(mSession, mInputFrameID);
|
|
}
|
|
result = GetSensorState(frameTiming);
|
|
result.inputFrameID = mInputFrameID;
|
|
mLastSensorState[mInputFrameID % kMaxLatencyFrames] = result;
|
|
return result;
|
|
}
|
|
|
|
VRHMDSensorState
|
|
HMDInfoOculus::GetImmediateSensorState()
|
|
{
|
|
return GetSensorState(0.0);
|
|
}
|
|
|
|
VRHMDSensorState
|
|
HMDInfoOculus::GetSensorState(double timeOffset)
|
|
{
|
|
VRHMDSensorState result;
|
|
result.Clear();
|
|
|
|
ovrTrackingState state = ovr_GetTrackingState(mSession, timeOffset, true);
|
|
ovrPoseStatef& pose(state.HeadPose);
|
|
|
|
result.timestamp = pose.TimeInSeconds;
|
|
|
|
if (state.StatusFlags & ovrStatus_OrientationTracked) {
|
|
result.flags |= VRStateValidFlags::State_Orientation;
|
|
|
|
result.orientation[0] = pose.ThePose.Orientation.x;
|
|
result.orientation[1] = pose.ThePose.Orientation.y;
|
|
result.orientation[2] = pose.ThePose.Orientation.z;
|
|
result.orientation[3] = pose.ThePose.Orientation.w;
|
|
|
|
result.angularVelocity[0] = pose.AngularVelocity.x;
|
|
result.angularVelocity[1] = pose.AngularVelocity.y;
|
|
result.angularVelocity[2] = pose.AngularVelocity.z;
|
|
|
|
result.angularAcceleration[0] = pose.AngularAcceleration.x;
|
|
result.angularAcceleration[1] = pose.AngularAcceleration.y;
|
|
result.angularAcceleration[2] = pose.AngularAcceleration.z;
|
|
}
|
|
|
|
if (state.StatusFlags & ovrStatus_PositionTracked) {
|
|
result.flags |= VRStateValidFlags::State_Position;
|
|
|
|
result.position[0] = pose.ThePose.Position.x;
|
|
result.position[1] = pose.ThePose.Position.y;
|
|
result.position[2] = pose.ThePose.Position.z;
|
|
|
|
result.linearVelocity[0] = pose.LinearVelocity.x;
|
|
result.linearVelocity[1] = pose.LinearVelocity.y;
|
|
result.linearVelocity[2] = pose.LinearVelocity.z;
|
|
|
|
result.linearAcceleration[0] = pose.LinearAcceleration.x;
|
|
result.linearAcceleration[1] = pose.LinearAcceleration.y;
|
|
result.linearAcceleration[2] = pose.LinearAcceleration.z;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
struct RenderTargetSetOculus : public VRHMDRenderingSupport::RenderTargetSet
|
|
{
|
|
RenderTargetSetOculus(const IntSize& aSize,
|
|
HMDInfoOculus *aHMD,
|
|
ovrSwapTextureSet *aTS)
|
|
: hmd(aHMD)
|
|
{
|
|
textureSet = aTS;
|
|
size = aSize;
|
|
}
|
|
|
|
already_AddRefed<layers::CompositingRenderTarget> GetNextRenderTarget() override {
|
|
currentRenderTarget = (currentRenderTarget + 1) % renderTargets.Length();
|
|
textureSet->CurrentIndex = currentRenderTarget;
|
|
renderTargets[currentRenderTarget]->ClearOnBind();
|
|
RefPtr<layers::CompositingRenderTarget> rt = renderTargets[currentRenderTarget];
|
|
return rt.forget();
|
|
}
|
|
|
|
void Destroy() {
|
|
if (!hmd)
|
|
return;
|
|
|
|
if (hmd->GetOculusSession()) {
|
|
// If the ovrSession was already destroyed, so were all associated
|
|
// texture sets
|
|
ovr_DestroySwapTextureSet(hmd->GetOculusSession(), textureSet);
|
|
}
|
|
hmd = nullptr;
|
|
textureSet = nullptr;
|
|
}
|
|
|
|
~RenderTargetSetOculus() {
|
|
Destroy();
|
|
}
|
|
|
|
RefPtr<HMDInfoOculus> hmd;
|
|
ovrSwapTextureSet *textureSet;
|
|
};
|
|
|
|
#ifdef XP_WIN
|
|
class BasicTextureSourceD3D11 : public layers::TextureSourceD3D11
|
|
{
|
|
public:
|
|
BasicTextureSourceD3D11(ID3D11Texture2D *aTexture, const IntSize& aSize) {
|
|
mTexture = aTexture;
|
|
mSize = aSize;
|
|
}
|
|
};
|
|
|
|
struct RenderTargetSetD3D11 : public RenderTargetSetOculus
|
|
{
|
|
RenderTargetSetD3D11(layers::CompositorD3D11 *aCompositor,
|
|
const IntSize& aSize,
|
|
HMDInfoOculus *aHMD,
|
|
ovrSwapTextureSet *aTS)
|
|
: RenderTargetSetOculus(aSize, aHMD, aTS)
|
|
{
|
|
compositor = aCompositor;
|
|
|
|
renderTargets.SetLength(aTS->TextureCount);
|
|
|
|
currentRenderTarget = aTS->CurrentIndex;
|
|
|
|
for (int i = 0; i < aTS->TextureCount; ++i) {
|
|
ovrD3D11Texture *tex11;
|
|
RefPtr<layers::CompositingRenderTargetD3D11> rt;
|
|
|
|
tex11 = (ovrD3D11Texture*)&aTS->Textures[i];
|
|
rt = new layers::CompositingRenderTargetD3D11(tex11->D3D11.pTexture, IntPoint(0, 0), DXGI_FORMAT_B8G8R8A8_UNORM);
|
|
rt->SetSize(size);
|
|
renderTargets[i] = rt;
|
|
}
|
|
}
|
|
};
|
|
#endif
|
|
|
|
already_AddRefed<VRHMDRenderingSupport::RenderTargetSet>
|
|
HMDInfoOculus::CreateRenderTargetSet(layers::Compositor *aCompositor, const IntSize& aSize)
|
|
{
|
|
#ifdef XP_WIN
|
|
if (aCompositor->GetBackendType() == layers::LayersBackend::LAYERS_D3D11)
|
|
{
|
|
layers::CompositorD3D11 *comp11 = static_cast<layers::CompositorD3D11*>(aCompositor);
|
|
|
|
CD3D11_TEXTURE2D_DESC desc(DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, aSize.width, aSize.height, 1, 1,
|
|
D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET);
|
|
ovrSwapTextureSet *ts = nullptr;
|
|
|
|
ovrResult orv = ovr_CreateSwapTextureSetD3D11(mSession, comp11->GetDevice(), &desc, ovrSwapTextureSetD3D11_Typeless, &ts);
|
|
if (orv != ovrSuccess) {
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<RenderTargetSetD3D11> rts = new RenderTargetSetD3D11(comp11, aSize, this, ts);
|
|
return rts.forget();
|
|
}
|
|
#endif
|
|
|
|
if (aCompositor->GetBackendType() == layers::LayersBackend::LAYERS_OPENGL) {
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
void
|
|
HMDInfoOculus::DestroyRenderTargetSet(RenderTargetSet *aRTSet)
|
|
{
|
|
RenderTargetSetOculus *rts = static_cast<RenderTargetSetOculus*>(aRTSet);
|
|
rts->Destroy();
|
|
}
|
|
|
|
void
|
|
HMDInfoOculus::SubmitFrame(RenderTargetSet *aRTSet, int32_t aInputFrameID)
|
|
{
|
|
RenderTargetSetOculus *rts = static_cast<RenderTargetSetOculus*>(aRTSet);
|
|
MOZ_ASSERT(rts->hmd != nullptr);
|
|
MOZ_ASSERT(rts->textureSet != nullptr);
|
|
MOZ_ASSERT(aInputFrameID >= 0);
|
|
if (aInputFrameID < 0) {
|
|
// Sanity check to prevent invalid memory access on builds with assertions
|
|
// disabled.
|
|
aInputFrameID = 0;
|
|
}
|
|
|
|
VRHMDSensorState sensorState = mLastSensorState[aInputFrameID % kMaxLatencyFrames];
|
|
// It is possible to get a cache miss on mLastSensorState if latency is
|
|
// longer than kMaxLatencyFrames. An optimization would be to find a frame
|
|
// that is closer than the one selected with the modulus.
|
|
// If we hit this; however, latency is already so high that the site is
|
|
// un-viewable and a more accurate pose prediction is not likely to
|
|
// compensate.
|
|
ovrLayerEyeFov layer;
|
|
memset(&layer, 0, sizeof(layer));
|
|
layer.Header.Type = ovrLayerType_EyeFov;
|
|
layer.Header.Flags = 0;
|
|
layer.ColorTexture[0] = rts->textureSet;
|
|
layer.ColorTexture[1] = nullptr;
|
|
layer.Fov[0] = mFOVPort[0];
|
|
layer.Fov[1] = mFOVPort[1];
|
|
layer.Viewport[0].Pos.x = 0;
|
|
layer.Viewport[0].Pos.y = 0;
|
|
layer.Viewport[0].Size.w = rts->size.width / 2;
|
|
layer.Viewport[0].Size.h = rts->size.height;
|
|
layer.Viewport[1].Pos.x = rts->size.width / 2;
|
|
layer.Viewport[1].Pos.y = 0;
|
|
layer.Viewport[1].Size.w = rts->size.width / 2;
|
|
layer.Viewport[1].Size.h = rts->size.height;
|
|
|
|
const Point3D& l = rts->hmd->mDeviceInfo.mEyeTranslation[0];
|
|
const Point3D& r = rts->hmd->mDeviceInfo.mEyeTranslation[1];
|
|
const ovrVector3f hmdToEyeViewOffset[2] = { { l.x, l.y, l.z },
|
|
{ r.x, r.y, r.z } };
|
|
|
|
for (uint32_t i = 0; i < 2; ++i) {
|
|
gfx::Quaternion o(sensorState.orientation[0],
|
|
sensorState.orientation[1],
|
|
sensorState.orientation[2],
|
|
sensorState.orientation[3]);
|
|
Point3D vo(hmdToEyeViewOffset[i].x, hmdToEyeViewOffset[i].y, hmdToEyeViewOffset[i].z);
|
|
Point3D p = o.RotatePoint(vo);
|
|
|
|
layer.RenderPose[i].Orientation.x = o.x;
|
|
layer.RenderPose[i].Orientation.y = o.y;
|
|
layer.RenderPose[i].Orientation.z = o.z;
|
|
layer.RenderPose[i].Orientation.w = o.w;
|
|
layer.RenderPose[i].Position.x = p.x + sensorState.position[0];
|
|
layer.RenderPose[i].Position.y = p.y + sensorState.position[1];
|
|
layer.RenderPose[i].Position.z = p.z + sensorState.position[2];
|
|
}
|
|
|
|
ovrLayerHeader *layers = &layer.Header;
|
|
ovrResult orv = ovr_SubmitFrame(mSession, aInputFrameID, nullptr, &layers, 1);
|
|
//printf_stderr("Submitted frame %d, result: %d\n", rts->textureSet->CurrentIndex, orv);
|
|
if (orv != ovrSuccess) {
|
|
// not visible? failed?
|
|
}
|
|
}
|
|
|
|
/*static*/ already_AddRefed<VRHMDManagerOculus>
|
|
VRHMDManagerOculus::Create()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (!gfxPrefs::VREnabled() || !gfxPrefs::VROculusEnabled())
|
|
{
|
|
return nullptr;
|
|
}
|
|
|
|
if (!InitializeOculusCAPI()) {
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<VRHMDManagerOculus> manager = new VRHMDManagerOculus();
|
|
return manager.forget();
|
|
}
|
|
|
|
bool
|
|
VRHMDManagerOculus::Init()
|
|
{
|
|
if (!mOculusInitialized) {
|
|
nsIThread* thread = nullptr;
|
|
NS_GetCurrentThread(&thread);
|
|
mOculusThread = already_AddRefed<nsIThread>(thread);
|
|
|
|
ovrInitParams params;
|
|
memset(¶ms, 0, sizeof(params));
|
|
params.Flags = ovrInit_RequestVersion;
|
|
params.RequestedMinorVersion = OVR_MINOR_VERSION;
|
|
params.LogCallback = nullptr;
|
|
params.ConnectionTimeoutMS = 0;
|
|
|
|
ovrResult orv = ovr_Initialize(¶ms);
|
|
|
|
if (orv == ovrSuccess) {
|
|
mOculusInitialized = true;
|
|
}
|
|
}
|
|
|
|
return mOculusInitialized;
|
|
}
|
|
|
|
void
|
|
VRHMDManagerOculus::Destroy()
|
|
{
|
|
if(mOculusInitialized) {
|
|
MOZ_ASSERT(NS_GetCurrentThread() == mOculusThread);
|
|
mOculusThread = nullptr;
|
|
|
|
mHMDInfo = nullptr;
|
|
|
|
ovr_Shutdown();
|
|
mOculusInitialized = false;
|
|
}
|
|
}
|
|
|
|
void
|
|
VRHMDManagerOculus::GetHMDs(nsTArray<RefPtr<VRHMDInfo>>& aHMDResult)
|
|
{
|
|
if (!mOculusInitialized) {
|
|
return;
|
|
}
|
|
|
|
// ovr_Create can be slow when no HMD is present and we wish
|
|
// to keep the same oculus session when possible, so we detect
|
|
// presence of an HMD with ovr_GetHmdDesc before calling ovr_Create
|
|
ovrHmdDesc desc = ovr_GetHmdDesc(NULL);
|
|
if (desc.Type == ovrHmd_None) {
|
|
// No HMD connected.
|
|
mHMDInfo = nullptr;
|
|
} else if (mHMDInfo == nullptr) {
|
|
// HMD Detected
|
|
ovrSession session;
|
|
ovrGraphicsLuid luid;
|
|
ovrResult orv = ovr_Create(&session, &luid);
|
|
if (orv == ovrSuccess) {
|
|
mHMDInfo = new HMDInfoOculus(session);
|
|
}
|
|
}
|
|
|
|
if (mHMDInfo) {
|
|
aHMDResult.AppendElement(mHMDInfo);
|
|
}
|
|
}
|