Updated to Oculus SDK 42

demo/addons/godot-openxr/CHANGES.md

@@ -1,6 +1,11 @@
 Changes to the Godot OpenXR asset
 =================================
 
+1.4.0
+-------------------
+- Oculus OpenXR mobile SDK version 42 update.
+
+
 1.3.0
 -------------------
 - Added default interaction profiles for Samsung Odyssey, HTC Cosmos, HTC Focus and Huawei controllers.

thirdparty/README.md

@@ -23,7 +23,7 @@ Godots CPP bindings library (submoduled)
 This is a copy of the Oculus OpenXR mobile SDK downloaded from [here](https://developer.oculus.com/downloads/package/oculus-openxr-mobile-sdk).
 
 - Upstream: https://developer.oculus.com/downloads/package/oculus-openxr-mobile-sdk
-- Version: 40.0.0
+- Version: 42.0.0
 - License: https://developer.oculus.com/licenses/oculussdk/
 
 ## OpenXR loader

thirdparty/oculus_mobile_sdk/1stParty/OVR/Include/JniUtils.h

@@ -1,13 +1,14 @@
+// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+
 /************************************************************************************
 
 Filename    :   JniUtils.h
 Content     :   JNI utility functions
 Created     :   October 21, 2014
 Authors     :   J.M.P. van Waveren, Jonathan E. Wright
 
-Copyright   :   Copyright (c) Facebook Technologies, LLC and its affiliates. All rights reserved.
-
 *************************************************************************************/
+
 #ifndef OVR_JniUtils_h
 #define OVR_JniUtils_h
 

thirdparty/oculus_mobile_sdk/1stParty/OVR/Include/OVR_Asserts.h

@@ -1,28 +1,31 @@
-/************************************************************************************
-
-Filename    :   OVR_Asserts.h
-Content     :   Capture Asserts for Release and Debug builds. Send Telemetry logs in Release builds.
-Created     :   July, 2019
-Notes       :
-
-Copyright   :   Copyright (c) Facebook Technologies, LLC and its affiliates. All rights reserved.
-
-Licensed under the Oculus VR Rift SDK License Version 3.3 (the "License");
-you may not use the Oculus VR Rift SDK except in compliance with the License,
-which is provided at the time of installation or download, or which
-otherwise accompanies this software in either electronic or hard copy form.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * Licensed under the Oculus SDK License Agreement (the "License");
+ * you may not use the Oculus SDK except in compliance with the License,
+ * which is provided at the time of installation or download, or which
+ * otherwise accompanies this software in either electronic or hard copy form.
+ *
+ * You may obtain a copy of the License at
+ *
+ * https://developer.oculus.com/licenses/oculussdk/
+ *
+ * Unless required by applicable law or agreed to in writing, the Oculus SDK
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-You may obtain a copy of the License at
-
-http://www.oculusvr.com/licenses/LICENSE-3.3
-
-Unless required by applicable law or agreed to in writing, the Oculus VR SDK
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+/************************************************************************************
+ * Filename    :   OVR_Asserts.h
+ * Content     :   Capture Asserts for Release and Debug builds. Send Telemetry logs in
+ *                 Release builds.
+ * Created     :   July, 2019
+ * Notes       :
+ ***********************************************************************************/
 
-************************************************************************************/
 #ifndef OVR_Asserts_h
 #define OVR_Asserts_h
 

thirdparty/oculus_mobile_sdk/1stParty/OVR/Include/OVR_BitFlags.h

@@ -1,3 +1,5 @@
+// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+
 /************************************************************************************
 
 PublicHeader:   OVR_Kernel.h
@@ -6,8 +8,6 @@ Content     :   Template for typesafe number types.
 Created     :   June 5, 2014
 Authors     :   Jonathan E. wright
 
-Copyright   :   Copyright (c) Facebook Technologies, LLC and its affiliates. All rights reserved.
-
 *************************************************************************************/
 
 #if !defined(OVR_BitFlags_h)

thirdparty/oculus_mobile_sdk/1stParty/OVR/Include/OVR_Compiler.h

@@ -1,29 +1,30 @@
-/************************************************************************************
-
-PublicHeader:   OVR_Types.h
-Filename    :   OVR_Compiler.h
-Content     :   Compiler-specific feature identification and utilities
-Created     :   June 19, 2014
-Notes       :
-
-Copyright   :   Copyright (c) Facebook Technologies, LLC and its affiliates. All rights reserved.
-
-Licensed under the Oculus VR Rift SDK License Version 3.3 (the "License");
-you may not use the Oculus VR Rift SDK except in compliance with the License,
-which is provided at the time of installation or download, or which
-otherwise accompanies this software in either electronic or hard copy form.
-
-You may obtain a copy of the License at
-
-http://www.oculusvr.com/licenses/LICENSE-3.3
-
-Unless required by applicable law or agreed to in writing, the Oculus VR SDK
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * Licensed under the Oculus SDK License Agreement (the "License");
+ * you may not use the Oculus SDK except in compliance with the License,
+ * which is provided at the time of installation or download, or which
+ * otherwise accompanies this software in either electronic or hard copy form.
+ *
+ * You may obtain a copy of the License at
+ *
+ * https://developer.oculus.com/licenses/oculussdk/
+ *
+ * Unless required by applicable law or agreed to in writing, the Oculus SDK
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-************************************************************************************/
+/************************************************************************************
+ * PublicHeader:   OVR_Types.h
+ * Filename    :   OVR_Compiler.h
+ * Content     :   Compiler-specific feature identification and utilities
+ * Created     :   June 19, 2014
+ * Notes       :
+ ***********************************************************************************/
 
 #ifndef OVR_Compiler_h
 #define OVR_Compiler_h
@@ -75,6 +76,12 @@ limitations under the License.
 #endif
 #endif
 
+#if (__cplusplus > 199711L)
+#define OVR_CPP11
+#else
+#undef OVR_CPP11
+#endif
+
 #elif defined(__GNUC__)
 #define OVR_CC_GNU
 

thirdparty/oculus_mobile_sdk/1stParty/OVR/Include/OVR_DebugMutex.h

@@ -1,3 +1,5 @@
+// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+
 /************************************************************************************
 
 Filename    :   OVR_DebugMutex.h
@@ -11,8 +13,6 @@ Content     :   Implements wrappers for std::mutex and that allows tracking of w
 Created     :   May 12, 2020
 Authors     :   Jonathan Wright
 
-Copyright   :   Copyright (c) Facebook Technologies, LLC and its affiliates. All rights reserved.
-
 *************************************************************************************/
 
 #include "OVR_LogUtils.h"

thirdparty/oculus_mobile_sdk/1stParty/OVR/Include/OVR_Deque.h

@@ -1,32 +1,35 @@
-/************************************************************************************
-
-Filename    :   OVR_Deque.h
-Content     :   Deque container
-Created     :   Nov. 15, 2013
-Authors     :   Dov Katz
-
-Copyright   :   Copyright (c) Facebook Technologies, LLC and its affiliates. All rights reserved.
-
-Licensed under the Oculus VR Rift SDK License Version 3.3 (the "License");
-you may not use the Oculus VR Rift SDK except in compliance with the License,
-which is provided at the time of installation or download, or which
-otherwise accompanies this software in either electronic or hard copy form.
-
-You may obtain a copy of the License at
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * Licensed under the Oculus SDK License Agreement (the "License");
+ * you may not use the Oculus SDK except in compliance with the License,
+ * which is provided at the time of installation or download, or which
+ * otherwise accompanies this software in either electronic or hard copy form.
+ *
+ * You may obtain a copy of the License at
+ *
+ * https://developer.oculus.com/licenses/oculussdk/
+ *
+ * Unless required by applicable law or agreed to in writing, the Oculus SDK
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-http://www.oculusvr.com/licenses/LICENSE-3.3
-
-Unless required by applicable law or agreed to in writing, the Oculus VR SDK
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-*************************************************************************************/
+/************************************************************************************
+ * Filename    :   OVR_Deque.h
+ * Content     :   Deque container
+ * Created     :   Nov. 15, 2013
+ * Authors     :   Dov Katz
+ ***********************************************************************************/
 
 #ifndef OVR_Deque_h
 #define OVR_Deque_h
 
+#include <cstdlib>
+
 namespace OVR {
 
 #define OVR_ALLOC malloc

thirdparty/oculus_mobile_sdk/1stParty/OVR/Include/OVR_JSON.h

@@ -1,3 +1,23 @@
+/*
+ * Portions Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * Licensed under the Oculus SDK License Agreement (the "License");
+ * you may not use the Oculus SDK except in compliance with the License,
+ * which is provided at the time of installation or download, or which
+ * otherwise accompanies this software in either electronic or hard copy form.
+ *
+ * You may obtain a copy of the License at
+ *
+ * https://developer.oculus.com/licenses/oculussdk/
+ *
+ * Unless required by applicable law or agreed to in writing, the Oculus SDK
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 /************************************************************************************
 
 PublicHeader:   None
@@ -29,23 +49,6 @@ Notes       :
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 
-Copyright   :   Copyright (c) Facebook Technologies, LLC and its affiliates. All rights reserved.
-
-Licensed under the Oculus VR Rift SDK License Version 3.3 (the "License");
-you may not use the Oculus VR Rift SDK except in compliance with the License,
-which is provided at the time of installation or download, or which
-otherwise accompanies this software in either electronic or hard copy form.
-
-You may obtain a copy of the License at
-
-http://www.oculusvr.com/licenses/LICENSE-3.3
-
-Unless required by applicable law or agreed to in writing, the Oculus VR SDK
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
 ************************************************************************************/
 #ifndef OVR_JSON_h
 #define OVR_JSON_h

thirdparty/oculus_mobile_sdk/1stParty/OVR/Include/OVR_Lockless.h

@@ -1,28 +1,29 @@
-/************************************************************************************
-
-Filename    :   OVR_Lockless.h
-Content     :   Lock-less classes for producer/consumer communication
-Created     :   November 9, 2013
-Authors     :   John Carmack
-
-Copyright   :   Copyright (c) Facebook Technologies, LLC and its affiliates. All rights reserved.
-
-Licensed under the Oculus VR Rift SDK License Version 3.3 (the "License");
-you may not use the Oculus VR Rift SDK except in compliance with the License,
-which is provided at the time of installation or download, or which
-otherwise accompanies this software in either electronic or hard copy form.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * Licensed under the Oculus SDK License Agreement (the "License");
+ * you may not use the Oculus SDK except in compliance with the License,
+ * which is provided at the time of installation or download, or which
+ * otherwise accompanies this software in either electronic or hard copy form.
+ *
+ * You may obtain a copy of the License at
+ *
+ * https://developer.oculus.com/licenses/oculussdk/
+ *
+ * Unless required by applicable law or agreed to in writing, the Oculus SDK
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-You may obtain a copy of the License at
-
-http://www.oculusvr.com/licenses/LICENSE-3.3
-
-Unless required by applicable law or agreed to in writing, the Oculus VR SDK
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-*************************************************************************************/
+/************************************************************************************
+ * Filename    :   OVR_Lockless.h
+ * Content     :   Lock-less classes for producer/consumer communication
+ * Created     :   November 9, 2013
+ * Authors     :   John Carmack
+ ***********************************************************************************/
 
 #ifndef OVR_Lockless_h
 #define OVR_Lockless_h

thirdparty/oculus_mobile_sdk/1stParty/OVR/Include/OVR_LogUtils.h

@@ -1,13 +1,14 @@
+// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+
 /************************************************************************************
 
 Filename    :   OVR_LogUtils.h (Previously Log.h)
 Content     :   Macros and helpers for Android logging.
 Created     :   4/15/2014
 Authors     :   Jonathan E. Wright
 
-Copyright   :   Copyright (c) Facebook Technologies, LLC and its affiliates. All rights reserved.
-
 *************************************************************************************/
+
 #if !defined(OVRLib_Log_h)
 #define OVRLib_Log_h
 

thirdparty/oculus_mobile_sdk/1stParty/OVR/Include/OVR_Math.h

@@ -1,7 +1,8 @@
+// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+
 /********************************************************************************/ /**
  \file      OVR_Math.h
  \brief     Implementation of 3D primitives such as vectors, matrices.
- \copyright Copyright (c) Facebook Technologies, LLC and its affiliates. All rights reserved.
  *************************************************************************************/
 
 #ifndef OVR_Math_h
@@ -100,7 +101,7 @@ inline T clamp(T v, T lo, T hi) {
 //
 // Independent OVR_MATH_UNUSED implementation for OVR_Math.h.
 
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__clang__)
 #define OVR_MATH_UNUSED(a)                                 \
     do {                                                   \
         __typeof__(&a) __attribute__((unused)) __tmp = &a; \