Skip to content

Commit

Permalink
OpenXR SDK 1.0.24 (2022-06-23)
Browse files Browse the repository at this point in the history 
-   Registry
    -   Add new XR_EXT_palm_pose multi-vendor extension. (internal MR
        2112)
    -   Add new XR_FB_scene vendor extension. (internal MR 2237)
    -   Fix structure definition in XR_FB_spatial_entity_container.
        (internal MR 2278)
    -   scripts: Teach xr_conventions that 2D, 3D, etc. are words for
        the purposes of structure type enum generation. (internal MR
        2237)
-   SDK
    -   Loader: Fix filename and native lib dir sequence for log
        (OpenXR-SDK-Source PR 311)
    -   Loader: Fix loader building with Gradle and add CI checking for
        loader building with Gradle (OpenXR-SDK-Source PR 312)
    -   hello_xr: Pick background clear color based on the selected
        environment blend mode. (internal MR 2275)
    -   hello_xr: Defer Vulkan CPU sync until the next frame begins.
        (OpenXR-SDK-Source PR 277)
    -   hello_xr: Fix shader compile on Mali driver (OpenXR-SDK-Source
        PR 310)
    -   scripts: Delegate generating structure types to the conventions
        object as done elsewhere in the repo. (internal MR 2237)
  • Loading branch information
@rpavlik
rpavlik committed Jun 23, 2022
1 parent 885a90f commit 1ca7bec
Show file tree
Hide file tree
Showing 9 changed files with 294 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -45,6 +45,7 @@ local.properties

# Don't ignore these things
!.*.license
!.appveyor.yml
!.azure-pipelines/
!.azure-pipelines/nuget/NugetTemplate/build
!.clang-format
Expand Down
29 changes: 29 additions & 0 deletions CHANGELOG.SDK.md
View file
Expand Up @@ -19,6 +19,35 @@ 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 SDK 1.0.24 (2022-06-23)

- Registry
- Add new `XR_EXT_palm_pose` multi-vendor extension.
([internal MR 2112](https://gitlab.khronos.org/openxr/openxr/merge_requests/2112))
- Add new `XR_FB_scene` vendor extension.
([internal MR 2237](https://gitlab.khronos.org/openxr/openxr/merge_requests/2237))
- Fix structure definition in `XR_FB_spatial_entity_container`.
([internal MR 2278](https://gitlab.khronos.org/openxr/openxr/merge_requests/2278))
- scripts: Teach xr_conventions that 2D, 3D, etc. are words for the purposes of
structure type enum generation.
([internal MR 2237](https://gitlab.khronos.org/openxr/openxr/merge_requests/2237))
- SDK
- Loader: Fix filename and native lib dir sequence for log
([OpenXR-SDK-Source PR 311](https://github.com/KhronosGroup/OpenXR-SDK-Source/pull/311))
- Loader: Fix loader building with Gradle and add CI checking for loader building
with Gradle
([OpenXR-SDK-Source PR 312](https://github.com/KhronosGroup/OpenXR-SDK-Source/pull/312))
- hello_xr: Pick background clear color based on the selected environment blend
mode.
([internal MR 2275](https://gitlab.khronos.org/openxr/openxr/merge_requests/2275))
- hello_xr: Defer Vulkan CPU sync until the next frame begins.
([OpenXR-SDK-Source PR 277](https://github.com/KhronosGroup/OpenXR-SDK-Source/pull/277))
- hello_xr: Fix shader compile on Mali driver
([OpenXR-SDK-Source PR 310](https://github.com/KhronosGroup/OpenXR-SDK-Source/pull/310))
- scripts: Delegate generating structure types to the conventions object as done
elsewhere in the repo.
([internal MR 2237](https://gitlab.khronos.org/openxr/openxr/merge_requests/2237))

## OpenXR SDK 1.0.23 (2022-05-27)

This release primarily features a large number of new vendor and multi-vendor
Expand Down
100 changes: 97 additions & 3 deletions include/openxr/openxr.h
View file
Expand Up @@ -25,7 +25,7 @@ extern "C" {
((((major) & 0xffffULL) << 48) | (((minor) & 0xffffULL) << 32) | ((patch) & 0xffffffffULL))

// OpenXR current version number.
#define XR_CURRENT_API_VERSION XR_MAKE_VERSION(1, 0, 23)
#define XR_CURRENT_API_VERSION XR_MAKE_VERSION(1, 0, 24)

#define XR_VERSION_MAJOR(version) (uint16_t)(((uint64_t)(version) >> 48)& 0xffffULL)
#define XR_VERSION_MINOR(version) (uint16_t)(((uint64_t)(version) >> 32) & 0xffffULL)
Expand Down Expand Up @@ -439,6 +439,9 @@ typedef enum XrStructureType {
XR_TYPE_SWAPCHAIN_STATE_SAMPLER_VULKAN_FB = 1000163000,
XR_TYPE_COMPOSITION_LAYER_SPACE_WARP_INFO_FB = 1000171000,
XR_TYPE_SYSTEM_SPACE_WARP_PROPERTIES_FB = 1000171001,
XR_TYPE_SEMANTIC_LABELS_FB = 1000175000,
XR_TYPE_ROOM_LAYOUT_FB = 1000175001,
XR_TYPE_BOUNDARY_2D_FB = 1000175002,
XR_TYPE_DIGITAL_LENS_CONTROL_ALMALENCE = 1000196000,
XR_TYPE_SPACE_CONTAINER_FB = 1000199000,
XR_TYPE_PASSTHROUGH_KEYBOARD_HANDS_INTENSITY_FB = 1000203002,
Expand Down Expand Up @@ -3317,6 +3320,10 @@ XR_DEFINE_ATOM(XrAsyncRequestIdFB)
typedef enum XrSpaceComponentTypeFB {
XR_SPACE_COMPONENT_TYPE_LOCATABLE_FB = 0,
XR_SPACE_COMPONENT_TYPE_STORABLE_FB = 1,
XR_SPACE_COMPONENT_TYPE_BOUNDED_2D_FB = 3,
XR_SPACE_COMPONENT_TYPE_BOUNDED_3D_FB = 4,
XR_SPACE_COMPONENT_TYPE_SEMANTIC_LABELS_FB = 5,
XR_SPACE_COMPONENT_TYPE_ROOM_LAYOUT_FB = 6,
XR_SPACE_COMPONENT_TYPE_SPACE_CONTAINER_FB = 7,
XR_SPACE_COMPONENT_TYPE_MAX_ENUM_FB = 0x7FFFFFFF
} XrSpaceComponentTypeFB;
Expand Down Expand Up @@ -4303,6 +4310,93 @@ typedef struct XrSystemSpaceWarpPropertiesFB {



#define XR_FB_scene 1
#define XR_FB_scene_SPEC_VERSION 1
#define XR_FB_SCENE_EXTENSION_NAME "XR_FB_scene"
typedef struct XrExtent3DfFB {
float width;
float height;
float depth;
} XrExtent3DfFB;

typedef struct XrOffset3DfFB {
float x;
float y;
float z;
} XrOffset3DfFB;

typedef struct XrRect3DfFB {
XrOffset3DfFB offset;
XrExtent3DfFB extent;
} XrRect3DfFB;

typedef struct XrSemanticLabelsFB {
XrStructureType type;
const void* XR_MAY_ALIAS next;
uint32_t bufferCapacityInput;
uint32_t bufferCountOutput;
char* buffer;
} XrSemanticLabelsFB;

typedef struct XrRoomLayoutFB {
XrStructureType type;
const void* XR_MAY_ALIAS next;
XrUuidEXT floorUuid;
XrUuidEXT ceilingUuid;
uint32_t wallUuidCapacityInput;
uint32_t wallUuidCountOutput;
XrUuidEXT* wallUuids;
} XrRoomLayoutFB;

typedef struct XrBoundary2DFB {
XrStructureType type;
const void* XR_MAY_ALIAS next;
uint32_t vertexCapacityInput;
uint32_t vertexCountOutput;
XrVector2f* vertices;
} XrBoundary2DFB;

typedef XrResult (XRAPI_PTR *PFN_xrGetSpaceBoundingBox2DFB)(XrSession session, XrSpace space, XrRect2Df* boundingBox2DOutput);
typedef XrResult (XRAPI_PTR *PFN_xrGetSpaceBoundingBox3DFB)(XrSession session, XrSpace space, XrRect3DfFB* boundingBox3DOutput);
typedef XrResult (XRAPI_PTR *PFN_xrGetSpaceSemanticLabelsFB)(XrSession session, XrSpace space, XrSemanticLabelsFB* semanticLabelsOutput);
typedef XrResult (XRAPI_PTR *PFN_xrGetSpaceBoundary2DFB)(XrSession session, XrSpace space, XrBoundary2DFB* boundary2DOutput);
typedef XrResult (XRAPI_PTR *PFN_xrGetSpaceRoomLayoutFB)(XrSession session, XrSpace space, XrRoomLayoutFB* roomLayoutOutput);

#ifndef XR_NO_PROTOTYPES
#ifdef XR_EXTENSION_PROTOTYPES
XRAPI_ATTR XrResult XRAPI_CALL xrGetSpaceBoundingBox2DFB(
XrSession session,
XrSpace space,
XrRect2Df* boundingBox2DOutput);

XRAPI_ATTR XrResult XRAPI_CALL xrGetSpaceBoundingBox3DFB(
XrSession session,
XrSpace space,
XrRect3DfFB* boundingBox3DOutput);

XRAPI_ATTR XrResult XRAPI_CALL xrGetSpaceSemanticLabelsFB(
XrSession session,
XrSpace space,
XrSemanticLabelsFB* semanticLabelsOutput);

XRAPI_ATTR XrResult XRAPI_CALL xrGetSpaceBoundary2DFB(
XrSession session,
XrSpace space,
XrBoundary2DFB* boundary2DOutput);

XRAPI_ATTR XrResult XRAPI_CALL xrGetSpaceRoomLayoutFB(
XrSession session,
XrSpace space,
XrRoomLayoutFB* roomLayoutOutput);
#endif /* XR_EXTENSION_PROTOTYPES */
#endif /* !XR_NO_PROTOTYPES */


#define XR_EXT_palm_pose 1
#define XR_EXT_palm_pose_SPEC_VERSION 2
#define XR_EXT_PALM_POSE_EXTENSION_NAME "XR_EXT_palm_pose"


#define XR_ALMALENCE_digital_lens_control 1
#define XR_ALMALENCE_digital_lens_control_SPEC_VERSION 1
#define XR_ALMALENCE_DIGITAL_LENS_CONTROL_EXTENSION_NAME "XR_ALMALENCE_digital_lens_control"
Expand All @@ -4329,13 +4423,13 @@ XRAPI_ATTR XrResult XRAPI_CALL xrSetDigitalLensControlALMALENCE(


#define XR_FB_spatial_entity_container 1
#define XR_FB_spatial_entity_container_SPEC_VERSION 1
#define XR_FB_spatial_entity_container_SPEC_VERSION 2
#define XR_FB_SPATIAL_ENTITY_CONTAINER_EXTENSION_NAME "XR_FB_spatial_entity_container"
typedef struct XrSpaceContainerFB {
XrStructureType type;
const void* XR_MAY_ALIAS next;
uint32_t uuidCapacityInput;
uint32_t* uuidCountOutput;
uint32_t uuidCountOutput;
XrUuidEXT* uuids;
} XrSpaceContainerFB;

Expand Down
49 changes: 49 additions & 0 deletions include/openxr/openxr_reflection.h
View file
Expand Up @@ -340,6 +340,9 @@ XR_ENUM_STR(XrResult);
_(XR_TYPE_SWAPCHAIN_STATE_SAMPLER_VULKAN_FB, 1000163000) \
_(XR_TYPE_COMPOSITION_LAYER_SPACE_WARP_INFO_FB, 1000171000) \
_(XR_TYPE_SYSTEM_SPACE_WARP_PROPERTIES_FB, 1000171001) \
_(XR_TYPE_SEMANTIC_LABELS_FB, 1000175000) \
_(XR_TYPE_ROOM_LAYOUT_FB, 1000175001) \
_(XR_TYPE_BOUNDARY_2D_FB, 1000175002) \
_(XR_TYPE_DIGITAL_LENS_CONTROL_ALMALENCE, 1000196000) \
_(XR_TYPE_SPACE_CONTAINER_FB, 1000199000) \
_(XR_TYPE_PASSTHROUGH_KEYBOARD_HANDS_INTENSITY_FB, 1000203002) \
Expand Down Expand Up @@ -660,6 +663,10 @@ XR_ENUM_STR(XrResult);
#define XR_LIST_ENUM_XrSpaceComponentTypeFB(_) \
_(XR_SPACE_COMPONENT_TYPE_LOCATABLE_FB, 0) \
_(XR_SPACE_COMPONENT_TYPE_STORABLE_FB, 1) \
_(XR_SPACE_COMPONENT_TYPE_BOUNDED_2D_FB, 3) \
_(XR_SPACE_COMPONENT_TYPE_BOUNDED_3D_FB, 4) \
_(XR_SPACE_COMPONENT_TYPE_SEMANTIC_LABELS_FB, 5) \
_(XR_SPACE_COMPONENT_TYPE_ROOM_LAYOUT_FB, 6) \
_(XR_SPACE_COMPONENT_TYPE_SPACE_CONTAINER_FB, 7) \
_(XR_SPACE_COMPONENT_TYPE_MAX_ENUM_FB, 0x7FFFFFFF)

Expand Down Expand Up @@ -2589,6 +2596,43 @@ XR_ENUM_STR(XrResult);
_(recommendedMotionVectorImageRectWidth) \
_(recommendedMotionVectorImageRectHeight) \

#define XR_LIST_STRUCT_XrExtent3DfFB(_) \
_(width) \
_(height) \
_(depth) \

#define XR_LIST_STRUCT_XrOffset3DfFB(_) \
_(x) \
_(y) \
_(z) \

#define XR_LIST_STRUCT_XrRect3DfFB(_) \
_(offset) \
_(extent) \

#define XR_LIST_STRUCT_XrSemanticLabelsFB(_) \
_(type) \
_(next) \
_(bufferCapacityInput) \
_(bufferCountOutput) \
_(buffer) \

#define XR_LIST_STRUCT_XrRoomLayoutFB(_) \
_(type) \
_(next) \
_(floorUuid) \
_(ceilingUuid) \
_(wallUuidCapacityInput) \
_(wallUuidCountOutput) \
_(wallUuids) \

#define XR_LIST_STRUCT_XrBoundary2DFB(_) \
_(type) \
_(next) \
_(vertexCapacityInput) \
_(vertexCountOutput) \
_(vertices) \

#define XR_LIST_STRUCT_XrDigitalLensControlALMALENCE(_) \
_(type) \
_(next) \
Expand Down Expand Up @@ -2823,6 +2867,9 @@ XR_ENUM_STR(XrResult);
_(XrEventDataSpaceEraseCompleteFB, XR_TYPE_EVENT_DATA_SPACE_ERASE_COMPLETE_FB) \
_(XrCompositionLayerSpaceWarpInfoFB, XR_TYPE_COMPOSITION_LAYER_SPACE_WARP_INFO_FB) \
_(XrSystemSpaceWarpPropertiesFB, XR_TYPE_SYSTEM_SPACE_WARP_PROPERTIES_FB) \
_(XrSemanticLabelsFB, XR_TYPE_SEMANTIC_LABELS_FB) \
_(XrRoomLayoutFB, XR_TYPE_ROOM_LAYOUT_FB) \
_(XrBoundary2DFB, XR_TYPE_BOUNDARY_2D_FB) \
_(XrDigitalLensControlALMALENCE, XR_TYPE_DIGITAL_LENS_CONTROL_ALMALENCE) \
_(XrSpaceContainerFB, XR_TYPE_SPACE_CONTAINER_FB) \
_(XrPassthroughKeyboardHandsIntensityFB, XR_TYPE_PASSTHROUGH_KEYBOARD_HANDS_INTENSITY_FB) \
Expand Down Expand Up @@ -3082,6 +3129,8 @@ XR_ENUM_STR(XrResult);
_(XR_FB_swapchain_update_state_vulkan, 164) \
_(XR_KHR_swapchain_usage_input_attachment_bit, 166) \
_(XR_FB_space_warp, 172) \
_(XR_FB_scene, 176) \
_(XR_EXT_palm_pose, 177) \
_(XR_ALMALENCE_digital_lens_control, 197) \
_(XR_FB_spatial_entity_container, 200) \
_(XR_FB_passthrough_keyboard_hands, 204) \
Expand Down

0 comments on commit 1ca7bec

Please sign in to comment.