OpenXR 1.0.2 release (27-August-2019)

Patch release for the 1.0 series.

Note that the loader on Windows has a **security fix**: All developers incorporating
the OpenXR loader should update immediately.

### GitHub Pull Requests

These had been integrated into the public repo incrementally.

- General, Build, Other
  - #112 - Update active runtime search documentation
  - #106 - List app changes
  - #114 - Support for building WindowsStore loader and layers, and simplified filename
  - #96 - Misc cleanup: build simplification, install hello_xr,
    allow building as subproject, fix null deref in validation layer.
- Loader
  - #102 - Default to catching exceptions, since not being able to catch
    (and having a non-throwing standard library) is less common
  - #109 - Factor out some debug-utils related code from the loader,
    and migrate validation layer to that shared code.
  - #108 - Update json_stream initialization to improve compatibility
  - #118 - Fix logic error in Linux active runtime search
  - #115, #117 - Simplification and refactoring.
- Layers
  - #111 - Some fixes to Validation Layer (as found applying to the UE4 OpenXR plugin)
  - #110 - Fix cleaning up session labels in validation layer
- From OpenXR-Docs:
  - #26 - Proposal for unbounded space and spatial anchor extensions (vendor extensions)

### Internal issues

- General, Build, Other
  - Allow project to be included in a parent project. (Internal MR 1512)
- hello_xr
  - Fix OpenGL version number to be XrVersion. (Internal MR 1515)
  - Make D3D11 debug device handling more friendly. (Internal MR 1504)
- Registry
  - Fix error in extension-added function. (Internal MR 1510)
  - Add Oculus Android extension. (Internal MR 1518)
  - Reserve additional extension number for Oculus. (Internal MR 1517)
- Loader
  - **Security fix**: Do not use HKEY_CURRENT_USER or environment variables when
    running as a medium-integrity process or higher on Windows.
    (Internal issue 1205, internal MR 1511)
  - Small updates to the loader documentation.

### New extension

- `XR_OCULUS_android_session_state_enable`

Author: rpavlik

CHANGELOG.SDK.md

@@ -12,6 +12,58 @@ along with any public pull requests that have been accepted.
 In this repository in particular, since it is primarily software,
 pull requests may be integrated as they are accepted even between periodic updates.
 
+## OpenXR 1.0.2 release (27-August-2019)
+
+Patch release for the 1.0 series.
+
+Note that the loader on Windows has a **security fix**: All developers incorporating
+the OpenXR loader should update immediately.
+
+### GitHub Pull Requests
+
+These had been integrated into the public repo incrementally.
+
+- General, Build, Other
+  - #112 - Update active runtime search documentation
+  - #106 - List app changes
+  - #114 - Support for building WindowsStore loader and layers, and simplified filename
+  - #96 - Misc cleanup: build simplification, install hello_xr,
+    allow building as subproject, fix null deref in validation layer.
+- Loader
+  - #102 - Default to catching exceptions, since not being able to catch
+    (and having a non-throwing standard library) is less common
+  - #109 - Factor out some debug-utils related code from the loader,
+    and migrate validation layer to that shared code.
+  - #108 - Update json_stream initialization to improve compatibility
+  - #118 - Fix logic error in Linux active runtime search
+  - #115, #117 - Simplification and refactoring.
+- Layers
+  - #111 - Some fixes to Validation Layer (as found applying to the UE4 OpenXR plugin)
+  - #110 - Fix cleaning up session labels in validation layer
+- From OpenXR-Docs:
+  - #26 - Proposal for unbounded space and spatial anchor extensions (vendor extensions)
+
+### Internal issues
+
+- General, Build, Other
+  - Allow project to be included in a parent project. (Internal MR 1512)
+- hello_xr
+  - Fix OpenGL version number to be XrVersion. (Internal MR 1515)
+  - Make D3D11 debug device handling more friendly. (Internal MR 1504)
+- Registry
+  - Fix error in extension-added function. (Internal MR 1510)
+  - Add Oculus Android extension. (Internal MR 1518)
+  - Reserve additional extension number for Oculus. (Internal MR 1517)
+- Loader
+  - **Security fix**: Do not use HKEY_CURRENT_USER or environment variables when
+    running as a medium-integrity process or higher on Windows.
+    (Internal issue 1205, internal MR 1511)
+  - Small updates to the loader documentation.
+
+### New extension
+
+- `XR_OCULUS_android_session_state_enable`
+
 ## OpenXR 1.0.1 release (2-August-2019)
 
 Patch release for the 1.0 series.

external/libs/glslang/CMakeLists.txt

@@ -15,7 +15,7 @@ elseif( ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" )
     add_definitions( -std=c++11 )
 endif()
 
-set( GLSLANG_DIR "${CMAKE_SOURCE_DIR}/../glslang" )
+set( GLSLANG_DIR "${PROJECT_SOURCE_DIR}/../glslang" )
 
 # SPIRV
 set( SOURCES

specification/Makefile

@@ -43,7 +43,7 @@ ifneq (,$(strip $(VERY_STRICT)))
 ASCIIDOC := $(ASCIIDOC) --failure-level WARN
 endif
 
-SPECREVISION = 1.0.1
+SPECREVISION = 1.0.2
 REVISION_COMPONENTS = $(subst ., ,$(SPECREVISION))
 MAJORMINORVER = $(word 1,$(REVISION_COMPONENTS)).$(word 2,$(REVISION_COMPONENTS))
 

specification/loader/design.adoc

@@ -389,15 +389,17 @@ XrResult res = xrCreateInstance(info, instance);
 if (XR_SUCCESS != res) {
     std::string error_message = "xrCreateInstance failed with result ";
     error_message += std::to_string(res);
-    LoaderLogger::LogErrorMessage(error_message);
+    LoaderLogger::LogErrorMessage("", error_message);
 }
 ----
 
 [source,c++]
 ----
 // After successfully adding all API layers
-LoaderLogger::LogInfoMessage("Loaded all API layers");
+LoaderLogger::LogInfoMessage("", "Loaded all API layers");
 ----
+
+In these examples, the message does not correspond to a named command so an empty string is passed.
 ====
 
 [[loaderlogrecorder]]
@@ -597,7 +599,7 @@ void LoaderCleanUpMapsForInstance(
 ----
   * pname:loader_instance is a pointer to the `LoaderInstance`
     that is going away and needs all references removed from all the
-    global unordered_maps.
+    global state.
 
 ==== xr_loader_generated.cpp ====
 
@@ -735,40 +737,32 @@ same `LoaderInstance*`.
 XRAPI_ATTR XrResult XRAPI_CALL xrCreateSession(
     XrInstance                                  instance,
     const XrSessionCreateInfo*                  createInfo,
-    XrSession*                                  session) {
-    try {
-        LoaderInstance *loader_instance = g_instance_map.Get(instance);
-        if (nullptr == loader_instance) {
-            LoaderLogger::LogValidationErrorMessage(
-                "VUID-xrCreateSession-instance-parameter",
-                "xrCreateSession",
-                "instance is not a valid XrInstance",
-                {XrLoaderLogObjectInfo{instance, XR_OBJECT_TYPE_INSTANCE}});
-            return XR_ERROR_HANDLE_INVALID;
-        }
-        const std::unique_ptr<XrGeneratedDispatchTable>& dispatch_table =
-            loader_instance->DispatchTable();
-        XrResult result = XR_SUCCESS;
-        result = dispatch_table->CreateSession(instance, createInfo, session);
-        if (XR_SUCCESS == result && nullptr != session) {
-            XrResult insert_result = g_session_map.Insert(*session, *loader_instance);
-            if (XR_FAILED(insert_result)) {
-                LoaderLogger::LogErrorMessage(
-                    "xrCreateSession",
-                    "Failed inserting new session into map: may be null or not unique");
-            }
+    XrSession*                                  session) XRLOADER_ABI_TRY {
+
+    LoaderInstance *loader_instance = g_instance_map.Get(instance);
+    if (nullptr == loader_instance) {
+        LoaderLogger::LogValidationErrorMessage(
+            "VUID-xrCreateSession-instance-parameter", "xrCreateSession",
+            "instance is not a valid XrInstance",
+            {XrSdkLogObjectInfo{instance, XR_OBJECT_TYPE_INSTANCE}});
+        return XR_ERROR_HANDLE_INVALID;
+    }
+    const std::unique_ptr<XrGeneratedDispatchTable> &dispatch_table =
+        loader_instance->DispatchTable();
+    XrResult result = XR_SUCCESS;
+    result = dispatch_table->CreateSession(instance, createInfo, session);
+    if (XR_SUCCESS == result && nullptr != session) {
+        XrResult insert_result =
+            g_session_map.Insert(*session, *loader_instance);
+        if (XR_FAILED(insert_result)) {
+            LoaderLogger::LogErrorMessage("xrCreateSession",
+                                          "Failed inserting new session into "
+                                          "map: may be null or not unique");
         }
-        return result;
-    } catch (std::bad_alloc &) {
-        LoaderLogger::LogErrorMessage("xrCreateSession",
-            "xrCreateSession trampoline failed allocating memory");
-        return XR_ERROR_OUT_OF_MEMORY;
-    } catch (...) {
-        LoaderLogger::LogErrorMessage("xrCreateSession",
-            "xrCreateSession trampoline encountered an unknown error");
-        return XR_ERROR_INITIALIZATION_FAILED;
     }
+    return result;
 }
+XRLOADER_ABI_CATCH_FALLBACK
 ----
 ====
 
@@ -780,32 +774,27 @@ is called.
 [source,c++]
 ----
 XRAPI_ATTR XrResult XRAPI_CALL xrDestroySession(
-    XrSession                                   session) {
-    try {
-        LoaderInstance *loader_instance = g_session_map.Get(session);
-        // Destroy the mapping entry for this item if it was valid.
-        if (nullptr != loader_instance) {
-            g_session_map.Erase(session);
-        }
-        if (nullptr == loader_instance) {
-            LoaderLogger::LogValidationErrorMessage(
-                "VUID-xrDestroySession-session-parameter", "xrDestroySession",
-                "session is not a valid XrSession",
-                {XrLoaderLogObjectInfo{session, XR_OBJECT_TYPE_SESSION} });
-            return XR_ERROR_HANDLE_INVALID;
-        }
-        const std::unique_ptr<XrGeneratedDispatchTable>& dispatch_table =
-            loader_instance->DispatchTable();
-        XrResult result = XR_SUCCESS;
-        result = dispatch_table->DestroySession(session);
-        return result;
-    } catch (...) {
-        LoaderLogger::LogErrorMessage("xrDestroySession",
-            "xrDestroySession trampoline encountered an unknown error");
-        // NOTE: Most calls only allow XR_SUCCESS as a return code
-        return XR_SUCCESS;
+    XrSession                                   session)
+    XRLOADER_ABI_TRY {
+    LoaderInstance *loader_instance = g_session_map.Get(session);
+    // Destroy the mapping entry for this item if it was valid.
+    if (nullptr != loader_instance) {
+        g_session_map.Erase(session);
+    }
+    if (nullptr == loader_instance) {
+        LoaderLogger::LogValidationErrorMessage(
+            "VUID-xrDestroySession-session-parameter", "xrDestroySession",
+            "session is not a valid XrSession",
+            {XrSdkLogObjectInfo{session, XR_OBJECT_TYPE_SESSION}});
+        return XR_ERROR_HANDLE_INVALID;
     }
+    const std::unique_ptr<XrGeneratedDispatchTable> &dispatch_table =
+        loader_instance->DispatchTable();
+    XrResult result = XR_SUCCESS;
+    result = dispatch_table->DestroySession(session);
+    return result;
 }
+XRLOADER_ABI_CATCH_FALLBACK
 ----
 ====
 

specification/registry/xr.xml

@@ -112,7 +112,7 @@ maintained in the master branch of the Khronos OpenXR GitHub project.
         updates them automatically by processing a line at a time.
         -->
         <type category="define">// OpenXR current version number.
-#define <name>XR_CURRENT_API_VERSION</name> <type>XR_MAKE_VERSION</type>(1, 0, 1)</type>
+#define <name>XR_CURRENT_API_VERSION</name> <type>XR_MAKE_VERSION</type>(1, 0, 2)</type>
 
         <!-- 
         NOTE: For avoidance of ambiguity, there should only be 1 <name> tag immediately in
@@ -978,7 +978,7 @@ maintained in the master branch of the Khronos OpenXR GitHub project.
             <member><type>XrTime</type>      <name>time</name></member>
         </type>
         <type category="struct" name="XrSpatialAnchorSpaceCreateInfoMSFT">
-            <member values="XR_TYPE_ACTION_SPACE_CREATE_INFO"><type>XrStructureType</type> <name>type</name></member>
+            <member values="XR_TYPE_SPATIAL_ANCHOR_SPACE_CREATE_INFO_MSFT"><type>XrStructureType</type> <name>type</name></member>
             <member>const <type>void</type>*                     <name>next</name></member>
             <member><type>XrSpatialAnchorMSFT</type>             <name>anchor</name></member>
             <member><type>XrPosef</type>                         <name>poseInAnchorSpace</name></member>
@@ -2344,5 +2344,20 @@ maintained in the master branch of the Khronos OpenXR GitHub project.
             <enum value="&quot;XR_MND_headless&quot;" name="XR_MND_HEADLESS_EXTENSION_NAME"/>
         </require>
     </extension>
+
+    <extension name="XR_OCULUS_extension_44" number="44" type="instance" supported="disabled">
+        <require>
+            <enum value="1" name="XR_OCULUS_extension_44_SPEC_VERSION"/>
+            <enum value="&quot;XR_OCULUS_extension_44&quot;" name="XR_OCULUS_EXTENSION_44_EXTENSION_NAME"/>
+        </require>
+    </extension>
+
+    <extension name="XR_OCULUS_android_session_state_enable" number="45" type="instance" supported="openxr">
+        <require>
+            <enum value="1" name="XR_OCULUS_android_session_state_enable_SPEC_VERSION"/>
+            <enum value="&quot;XR_OCULUS_android_session_state_enable&quot;" name="XR_OCULUS_ANDROID_SESSION_STATE_ENABLE_EXTENSION_NAME"/>
+        </require>
+    </extension>
+
     </extensions>
 </registry>