st/oxr: Handle LOCAL_FLOOR enums

This commit is contained in:
Jakob Bornecrantz 2023-04-30 15:41:03 +01:00
parent 2b921ab673
commit ce5669aabb
4 changed files with 8 additions and 3 deletions

View file

@ -57,6 +57,7 @@ oxr_ref_space_to_xr(enum oxr_space_type space_type)
switch (space_type) {
case OXR_SPACE_TYPE_REFERENCE_VIEW: return XR_REFERENCE_SPACE_TYPE_VIEW;
case OXR_SPACE_TYPE_REFERENCE_LOCAL: return XR_REFERENCE_SPACE_TYPE_LOCAL;
case OXR_SPACE_TYPE_REFERENCE_LOCAL_FLOOR: return XR_REFERENCE_SPACE_TYPE_LOCAL_FLOOR_EXT;
case OXR_SPACE_TYPE_REFERENCE_STAGE: return XR_REFERENCE_SPACE_TYPE_STAGE;
case OXR_SPACE_TYPE_REFERENCE_UNBOUNDED_MSFT: return XR_REFERENCE_SPACE_TYPE_UNBOUNDED_MSFT;
case OXR_SPACE_TYPE_REFERENCE_COMBINED_EYE_VARJO: return XR_REFERENCE_SPACE_TYPE_COMBINED_EYE_VARJO;
@ -72,6 +73,7 @@ xr_ref_space_to_oxr(XrReferenceSpaceType space_type)
switch (space_type) {
case XR_REFERENCE_SPACE_TYPE_VIEW: return OXR_SPACE_TYPE_REFERENCE_VIEW;
case XR_REFERENCE_SPACE_TYPE_LOCAL: return OXR_SPACE_TYPE_REFERENCE_LOCAL;
case XR_REFERENCE_SPACE_TYPE_LOCAL_FLOOR_EXT: return OXR_SPACE_TYPE_REFERENCE_LOCAL_FLOOR;
case XR_REFERENCE_SPACE_TYPE_STAGE: return OXR_SPACE_TYPE_REFERENCE_STAGE;
case XR_REFERENCE_SPACE_TYPE_UNBOUNDED_MSFT: return OXR_SPACE_TYPE_REFERENCE_UNBOUNDED_MSFT;
case XR_REFERENCE_SPACE_TYPE_COMBINED_EYE_VARJO: return OXR_SPACE_TYPE_REFERENCE_COMBINED_EYE_VARJO;

View file

@ -92,9 +92,10 @@ enum oxr_image_state
*/
enum oxr_space_type
{
OXR_SPACE_TYPE_REFERENCE_VIEW = 1,
OXR_SPACE_TYPE_REFERENCE_LOCAL = 2,
OXR_SPACE_TYPE_REFERENCE_STAGE = 3,
OXR_SPACE_TYPE_REFERENCE_VIEW,
OXR_SPACE_TYPE_REFERENCE_LOCAL,
OXR_SPACE_TYPE_REFERENCE_LOCAL_FLOOR,
OXR_SPACE_TYPE_REFERENCE_STAGE,
OXR_SPACE_TYPE_REFERENCE_UNBOUNDED_MSFT,
OXR_SPACE_TYPE_REFERENCE_COMBINED_EYE_VARJO,

View file

@ -1893,6 +1893,7 @@ oxr_space_type_is_reference(enum oxr_space_type space_type)
switch (space_type) {
case OXR_SPACE_TYPE_REFERENCE_VIEW:
case OXR_SPACE_TYPE_REFERENCE_LOCAL:
case OXR_SPACE_TYPE_REFERENCE_LOCAL_FLOOR:
case OXR_SPACE_TYPE_REFERENCE_STAGE:
case OXR_SPACE_TYPE_REFERENCE_UNBOUNDED_MSFT:
case OXR_SPACE_TYPE_REFERENCE_COMBINED_EYE_VARJO: return true;

View file

@ -119,6 +119,7 @@ get_xrt_space(struct oxr_logger *log, struct oxr_space *spc, struct xrt_space **
case OXR_SPACE_TYPE_ACTION: return get_xrt_space_action(log, spc, out_xspace);
case OXR_SPACE_TYPE_REFERENCE_VIEW: xspace = spc->sess->sys->xso->semantic.view; break;
case OXR_SPACE_TYPE_REFERENCE_LOCAL: xspace = spc->sess->sys->xso->semantic.local; break;
case OXR_SPACE_TYPE_REFERENCE_LOCAL_FLOOR: xspace = NULL; break;
case OXR_SPACE_TYPE_REFERENCE_STAGE: xspace = spc->sess->sys->xso->semantic.stage; break;
case OXR_SPACE_TYPE_REFERENCE_UNBOUNDED_MSFT: xspace = spc->sess->sys->xso->semantic.unbounded; break;
case OXR_SPACE_TYPE_REFERENCE_COMBINED_EYE_VARJO: xspace = NULL; break;