mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-26 17:37:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

doc: Document !2129

Browse source
This commit is contained in:
Pingping Meng 2024-02-01 10:55:26 +08:00 committed by pingping meng
parent fd816c838f
commit b5df7f1761
4 changed files with 47 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/changes/state_trackers/mr.2129.md Normal file
View file

@ -0,0 +1 @@
OpenXR: Add extension XR_FB_composition_layer_depth_test.

30
src/xrt/include/xrt/xrt_compositor.h
View file

@ -124,11 +124,11 @@ enum xrt_layer_composition_flags
*/
XRT_LAYER_COMPOSITION_ADVANCED_BLENDING_BIT = 1u << 9u,
/*!
/*!
* Depth testing is requested when composing this layer if this flag is set,
* see XrCompositionLayerDepthTestFB.
*/
XRT_LAYER_COMPOSITION_DEPTH_TEST = 1u << 10u,
XRT_LAYER_COMPOSITION_DEPTH_TEST = 1u << 10u,
};
/*!
@ -136,15 +136,15 @@ enum xrt_layer_composition_flags
*/
enum xrt_compare_op_fb
{
XRT_COMPARE_OP_NEVER_FB = 0,
XRT_COMPARE_OP_LESS_FB = 1,
XRT_COMPARE_OP_EQUAL_FB = 2,
XRT_COMPARE_OP_LESS_OR_EQUAL_FB = 3,
XRT_COMPARE_OP_GREATER_FB = 4,
XRT_COMPARE_OP_NOT_EQUAL_FB = 5,
XRT_COMPARE_OP_GREATER_OR_EQUAL_FB = 6,
XRT_COMPARE_OP_ALWAYS_FB = 7,
XRT_COMPARE_OP_MAX_ENUM_FB = 0x7FFFFFFF
XRT_COMPARE_OP_NEVER_FB = 0,
XRT_COMPARE_OP_LESS_FB = 1,
XRT_COMPARE_OP_EQUAL_FB = 2,
XRT_COMPARE_OP_LESS_OR_EQUAL_FB = 3,
XRT_COMPARE_OP_GREATER_FB = 4,
XRT_COMPARE_OP_NOT_EQUAL_FB = 5,
XRT_COMPARE_OP_GREATER_OR_EQUAL_FB = 6,
XRT_COMPARE_OP_ALWAYS_FB = 7,
XRT_COMPARE_OP_MAX_ENUM_FB = 0x7FFFFFFF
};
/*!
@ -251,8 +251,8 @@ struct xrt_layer_depth_data
struct xrt_layer_depth_test_data
{
bool depth_mask;
enum xrt_compare_op_fb compare_op;
bool depth_mask;
enum xrt_compare_op_fb compare_op;
};
/*!
@ -386,10 +386,10 @@ struct xrt_layer_data
*/
enum xrt_layer_composition_flags flags;
/*!
/*!
* Depth test data
*/
struct xrt_layer_depth_test_data depth_test;
struct xrt_layer_depth_test_data depth_test;
/*!
* Whether the main compositor should flip the direction of y when

7
src/xrt/state_trackers/oxr/oxr_extension_support.h
View file

@ -419,11 +419,12 @@
#endif
/*
* XR_FB_composition_layer_depth_test
*/
* XR_FB_composition_layer_depth_test
*/
#if defined(XR_FB_composition_layer_depth_test) && defined(XRT_FEATURE_OPENXR_LAYER_FB_DEPTH_TEST)
#define OXR_HAVE_FB_composition_layer_depth_test
#define OXR_EXTENSION_SUPPORT_FB_composition_layer_depth_test(_) _(FB_composition_layer_depth_test, FB_COMPOSITION_LAYER_DEPTH_TEST)
#define OXR_EXTENSION_SUPPORT_FB_composition_layer_depth_test(_) \
_(FB_composition_layer_depth_test, FB_COMPOSITION_LAYER_DEPTH_TEST)
#else
#define OXR_EXTENSION_SUPPORT_FB_composition_layer_depth_test(_)
#endif

54
src/xrt/state_trackers/oxr/oxr_session_frame_end.c
View file

@ -132,17 +132,17 @@ convert_layer_flags(XrSwapchainUsageFlags xr_flags)
static enum xrt_compare_op_fb
convert_compare_op(XrCompareOpFB xr_compare_op)
{
switch (xr_compare_op) {
case XR_COMPARE_OP_NEVER_FB: return XRT_COMPARE_OP_NEVER_FB;
case XR_COMPARE_OP_LESS_FB: return XRT_COMPARE_OP_LESS_FB;
case XR_COMPARE_OP_EQUAL_FB: return XRT_COMPARE_OP_EQUAL_FB;
case XR_COMPARE_OP_LESS_OR_EQUAL_FB: return XRT_COMPARE_OP_LESS_OR_EQUAL_FB;
case XR_COMPARE_OP_GREATER_FB: return XRT_COMPARE_OP_GREATER_FB;
case XR_COMPARE_OP_NOT_EQUAL_FB: return XRT_COMPARE_OP_NOT_EQUAL_FB;
case XR_COMPARE_OP_GREATER_OR_EQUAL_FB: return XRT_COMPARE_OP_GREATER_OR_EQUAL_FB;
case XR_COMPARE_OP_ALWAYS_FB: return XRT_COMPARE_OP_ALWAYS_FB;
default: return XRT_COMPARE_OP_MAX_ENUM_FB;
}
switch (xr_compare_op) {
case XR_COMPARE_OP_NEVER_FB: return XRT_COMPARE_OP_NEVER_FB;
case XR_COMPARE_OP_LESS_FB: return XRT_COMPARE_OP_LESS_FB;
case XR_COMPARE_OP_EQUAL_FB: return XRT_COMPARE_OP_EQUAL_FB;
case XR_COMPARE_OP_LESS_OR_EQUAL_FB: return XRT_COMPARE_OP_LESS_OR_EQUAL_FB;
case XR_COMPARE_OP_GREATER_FB: return XRT_COMPARE_OP_GREATER_FB;
case XR_COMPARE_OP_NOT_EQUAL_FB: return XRT_COMPARE_OP_NOT_EQUAL_FB;
case XR_COMPARE_OP_GREATER_OR_EQUAL_FB: return XRT_COMPARE_OP_GREATER_OR_EQUAL_FB;
case XR_COMPARE_OP_ALWAYS_FB: return XRT_COMPARE_OP_ALWAYS_FB;
default: return XRT_COMPARE_OP_MAX_ENUM_FB;
}
}
static enum xrt_layer_eye_visibility
@ -299,17 +299,17 @@ static void
fill_in_depth_test(struct oxr_session *sess, const XrCompositionLayerBaseHeader *layer, struct xrt_layer_data *data)
{
#ifdef OXR_HAVE_FB_composition_layer_depth_test
// Is the extension enabled?
if (!sess->sys->inst->extensions.FB_composition_layer_depth_test) {
return;
}
const XrCompositionLayerDepthTestFB *depthTest = OXR_GET_INPUT_FROM_CHAIN(
layer, (XrStructureType)XR_TYPE_COMPOSITION_LAYER_DEPTH_TEST_FB, XrCompositionLayerDepthTestFB);
if (depthTest != NULL) {
// Is the extension enabled?
if (!sess->sys->inst->extensions.FB_composition_layer_depth_test) {
return;
}
const XrCompositionLayerDepthTestFB *depthTest = OXR_GET_INPUT_FROM_CHAIN(
layer, (XrStructureType)XR_TYPE_COMPOSITION_LAYER_DEPTH_TEST_FB, XrCompositionLayerDepthTestFB);
if (depthTest != NULL) {
data->flags |= XRT_LAYER_COMPOSITION_DEPTH_TEST;
data->depth_test.depth_mask = depthTest->depthMask;
data->depth_test.compare_op = convert_compare_op(depthTest->compareOp);
}
data->depth_test.depth_mask = depthTest->depthMask;
data->depth_test.compare_op = convert_compare_op(depthTest->compareOp);
}
#endif // OXR_HAVE_FB_composition_layer_depth_test
}
@ -1181,7 +1181,7 @@ submit_quad_layer(struct oxr_session *sess,
fill_in_y_flip(sess, (XrCompositionLayerBaseHeader *)quad, &data);
fill_in_blend_factors(sess, (XrCompositionLayerBaseHeader *)quad, &data);
fill_in_layer_settings(sess, (XrCompositionLayerBaseHeader *)quad, &data);
fill_in_depth_test(sess, (XrCompositionLayerBaseHeader *)quad, &data);
fill_in_depth_test(sess, (XrCompositionLayerBaseHeader *)quad, &data);
xrt_result_t xret = xrt_comp_layer_quad(xc, head, sc->swapchain, &data);
OXR_CHECK_XRET(log, sess, xret, xrt_comp_layer_quad);
@ -1278,7 +1278,7 @@ submit_projection_layer(struct oxr_session *sess,
if (d_scs[0] != NULL && d_scs[1] != NULL) {
#ifdef OXR_HAVE_KHR_composition_layer_depth
fill_in_depth_test(sess, (XrCompositionLayerBaseHeader *)proj, &data);
fill_in_depth_test(sess, (XrCompositionLayerBaseHeader *)proj, &data);
data.type = XRT_LAYER_STEREO_PROJECTION_DEPTH;
xrt_result_t xret = xrt_comp_layer_stereo_projection_depth( //
xc, // compositor
@ -1337,7 +1337,7 @@ submit_cube_layer(struct oxr_session *sess,
fill_in_color_scale_bias(sess, (XrCompositionLayerBaseHeader *)cube, &data);
fill_in_y_flip(sess, (XrCompositionLayerBaseHeader *)cube, &data);
fill_in_blend_factors(sess, (XrCompositionLayerBaseHeader *)cube, &data);
fill_in_depth_test(sess, (XrCompositionLayerBaseHeader *)cube, &data);
fill_in_depth_test(sess, (XrCompositionLayerBaseHeader *)cube, &data);
struct xrt_pose pose = {
.orientation =
@ -1404,7 +1404,7 @@ submit_cylinder_layer(struct oxr_session *sess,
fill_in_y_flip(sess, (XrCompositionLayerBaseHeader *)cylinder, &data);
fill_in_blend_factors(sess, (XrCompositionLayerBaseHeader *)cylinder, &data);
fill_in_layer_settings(sess, (XrCompositionLayerBaseHeader *)cylinder, &data);
fill_in_depth_test(sess, (XrCompositionLayerBaseHeader *)cylinder, &data);
fill_in_depth_test(sess, (XrCompositionLayerBaseHeader *)cylinder, &data);
xrt_result_t xret = xrt_comp_layer_cylinder(xc, head, sc->swapchain, &data);
OXR_CHECK_XRET(log, sess, xret, xrt_comp_layer_cylinder);
@ -1452,7 +1452,7 @@ submit_equirect1_layer(struct oxr_session *sess,
fill_in_y_flip(sess, (XrCompositionLayerBaseHeader *)equirect, &data);
fill_in_blend_factors(sess, (XrCompositionLayerBaseHeader *)equirect, &data);
fill_in_layer_settings(sess, (XrCompositionLayerBaseHeader *)equirect, &data);
fill_in_depth_test(sess, (XrCompositionLayerBaseHeader *)equirect, &data);
fill_in_depth_test(sess, (XrCompositionLayerBaseHeader *)equirect, &data);
struct xrt_vec2 *scale = (struct xrt_vec2 *)&equirect->scale;
struct xrt_vec2 *bias = (struct xrt_vec2 *)&equirect->bias;
@ -1518,7 +1518,7 @@ submit_equirect2_layer(struct oxr_session *sess,
fill_in_y_flip(sess, (XrCompositionLayerBaseHeader *)equirect, &data);
fill_in_blend_factors(sess, (XrCompositionLayerBaseHeader *)equirect, &data);
fill_in_layer_settings(sess, (XrCompositionLayerBaseHeader *)equirect, &data);
fill_in_depth_test(sess, (XrCompositionLayerBaseHeader *)equirect, &data);
fill_in_depth_test(sess, (XrCompositionLayerBaseHeader *)equirect, &data);
xrt_result_t xret = xrt_comp_layer_equirect2(xc, head, sc->swapchain, &data);
OXR_CHECK_XRET(log, sess, xret, xrt_comp_layer_equirect2);