lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add overlay support for OpenXR

This commit is contained in:
Jakob Bornecrantz 2020-10-27 00:59:21 +00:00 committed by Bjorn
parent 70ef04e595
commit 28a0356a9a
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/modules/headset/headset_openxr.c
View File

@ -145,6 +145,7 @@ static struct {
XrHandTrackerEXT handTrackers[2];
struct {
bool handTracking;
bool overlay;
} features;
} state;
@ -198,7 +199,7 @@ static bool openxr_init(float supersample, float offset, uint32_t msaa, bool ove
for (uint32_t i = 0; i < extensionCount; i++) extensions[i].type = XR_TYPE_EXTENSION_PROPERTIES;
xrEnumerateInstanceExtensionProperties(NULL, 32, &extensionCount, extensions);
const char* enabledExtensionNames[4];
const char* enabledExtensionNames[5];
uint32_t enabledExtensionCount = 0;
#ifdef __ANDROID__
@ -212,6 +213,14 @@ static bool openxr_init(float supersample, float offset, uint32_t msaa, bool ove
state.features.handTracking = true;
}
#ifdef XR_EXTX_overlay
// Provisional extension.
if (overlay && hasExtension(extensions, extensionCount, XR_EXTX_OVERLAY_EXTENSION_NAME)) {
enabledExtensionNames[enabledExtensionCount++] = XR_EXTX_OVERLAY_EXTENSION_NAME;
state.features.overlay = true;
}
#endif
#ifdef LOVR_LINUX_EGL
enabledExtensionNames[enabledExtensionCount++] = XR_MNDX_EGL_ENABLE_EXTENSION_NAME;
#endif
@ -381,6 +390,19 @@ static bool openxr_init(float supersample, float offset, uint32_t msaa, bool ove
.systemId = state.system
};
#ifdef XR_EXTX_overlay
// Provisional extension.
XrSessionCreateInfoOverlayEXTX overlayInfo = {
.type = XR_TYPE_SESSION_CREATE_INFO_OVERLAY_EXTX,
.next = info.next,
// Fields may fluctuate, leave as auto initialised for now.
};
if (state.features.overlay) {
info.next = &overlayInfo;
}
#endif
XrSessionActionSetsAttachInfo attachInfo = {
.type = XR_TYPE_SESSION_ACTION_SETS_ATTACH_INFO,
.countActionSets = 1,
@ -482,10 +504,18 @@ static bool openxr_init(float supersample, float offset, uint32_t msaa, bool ove
lovrRelease(texture, lovrTextureDestroy);
}
XrCompositionLayerFlags layerFlags = 0;
if (state.features.overlay) {
layerFlags = XR_COMPOSITION_LAYER_BLEND_TEXTURE_SOURCE_ALPHA_BIT |
XR_COMPOSITION_LAYER_UNPREMULTIPLIED_ALPHA_BIT;
}
// Pre-init composition layer
state.layers[0] = (XrCompositionLayerProjection) {
.type = XR_TYPE_COMPOSITION_LAYER_PROJECTION,
.space = state.referenceSpace,
.layerFlags = layerFlags,
.viewCount = 2,
.views = state.layerViews
};