mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-21 06:01:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Quirk UnrealEngine

Browse source
This commit is contained in:
Jakob Bornecrantz 2021-02-16 17:52:42 +00:00
parent 4ef6211286
commit 2849c7c5ae
3 changed files with 47 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/xrt/state_trackers/oxr/oxr_instance.c
View file

@ -151,6 +151,17 @@ detect_engine(struct oxr_logger *log, struct oxr_instance *inst, const XrInstanc
} }
} }
static void
apply_quirks(struct oxr_logger *log, struct oxr_instance *inst)
{
if (starts_with("UnrealEngine", inst->appinfo.detected.engine.name) && //
inst->appinfo.detected.engine.major == 4 && //
inst->appinfo.detected.engine.minor <= 27 && //
inst->appinfo.detected.engine.patch <= 0) {
inst->quirks.disable_vulkan_format_depth_stencil = true;
}
}
XrResult XrResult
oxr_instance_create(struct oxr_logger *log, const XrInstanceCreateInfo *createInfo, struct oxr_instance **out_instance) oxr_instance_create(struct oxr_logger *log, const XrInstanceCreateInfo *createInfo, struct oxr_instance **out_instance)
{ {
@ -356,6 +367,9 @@ oxr_instance_create(struct oxr_logger *log, const XrInstanceCreateInfo *createIn
// Detect game engine. // Detect game engine.
detect_engine(log, inst, createInfo); detect_engine(log, inst, createInfo);
// Apply any quirks
apply_quirks(log, inst);
u_var_add_root((void *)inst, "XrInstance", true); u_var_add_root((void *)inst, "XrInstance", true);
/* ---- HACK ---- */ /* ---- HACK ---- */
@ -369,7 +383,8 @@ oxr_instance_create(struct oxr_logger *log, const XrInstanceCreateInfo *createIn
"\tcreateInfo->applicationInfo.engineName: %s\n" "\tcreateInfo->applicationInfo.engineName: %s\n"
"\tcreateInfo->applicationInfo.engineVersion: %i\n" "\tcreateInfo->applicationInfo.engineVersion: %i\n"
"\tappinfo.detected.engine.name: %s\n" "\tappinfo.detected.engine.name: %s\n"
"\tappinfo.detected.engine.version: %i.%i.%i\n", "\tappinfo.detected.engine.version: %i.%i.%i\n"
"\tquirks.disable_vulkan_format_depth_stencil: %s",
createInfo->applicationInfo.applicationName, // createInfo->applicationInfo.applicationName, //
createInfo->applicationInfo.applicationVersion, // createInfo->applicationInfo.applicationVersion, //
createInfo->applicationInfo.engineName, // createInfo->applicationInfo.engineName, //
@ -377,7 +392,8 @@ oxr_instance_create(struct oxr_logger *log, const XrInstanceCreateInfo *createIn
inst->appinfo.detected.engine.name, // inst->appinfo.detected.engine.name, //
inst->appinfo.detected.engine.major, // inst->appinfo.detected.engine.major, //
inst->appinfo.detected.engine.minor, // inst->appinfo.detected.engine.minor, //
inst->appinfo.detected.engine.patch); // inst->appinfo.detected.engine.patch, //
inst->quirks.disable_vulkan_format_depth_stencil ? "true" : "false"); //
*out_instance = inst; *out_instance = inst;

6
src/xrt/state_trackers/oxr/oxr_objects.h
View file

@ -1200,6 +1200,12 @@ struct oxr_instance
} detected; } detected;
} appinfo; } appinfo;
struct
{
//! Unreal has a bug in the VulkanRHI backend.
bool disable_vulkan_format_depth_stencil;
} quirks;
//! Debug messengers //! Debug messengers
struct oxr_debug_messenger *messengers[XRT_MAX_HANDLE_CHILDREN]; struct oxr_debug_messenger *messengers[XRT_MAX_HANDLE_CHILDREN];

18
src/xrt/state_trackers/oxr/oxr_session.c
View file

@ -100,6 +100,7 @@ oxr_session_enumerate_formats(struct oxr_logger *log,
uint32_t *formatCountOutput, uint32_t *formatCountOutput,
int64_t *formats) int64_t *formats)
{ {
struct oxr_instance *inst = sess->sys->inst;
struct xrt_compositor *xc = sess->compositor; struct xrt_compositor *xc = sess->compositor;
if (formatCountOutput == NULL) { if (formatCountOutput == NULL) {
return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, "(formatCountOutput == NULL) can not be null"); return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, "(formatCountOutput == NULL) can not be null");
@ -111,8 +112,21 @@ oxr_session_enumerate_formats(struct oxr_logger *log,
return oxr_session_success_result(sess); return oxr_session_success_result(sess);
} }
OXR_TWO_CALL_HELPER(log, formatCapacityInput, formatCountOutput, formats, xc->info.num_formats, uint32_t filtered_count = 0;
xc->info.formats, oxr_session_success_result(sess)); int64_t filtered_formats[XRT_MAX_SWAPCHAIN_FORMATS];
for (uint32_t i = 0; i < xc->info.num_formats; i++) {
int64_t format = xc->info.formats[i];
if (inst->quirks.disable_vulkan_format_depth_stencil &&
format == 130 /* VK_FORMAT_D32_SFLOAT_S8_UINT */) {
continue;
}
filtered_formats[filtered_count++] = format;
}
OXR_TWO_CALL_HELPER(log, formatCapacityInput, formatCountOutput, formats, filtered_count, filtered_formats,
oxr_session_success_result(sess));
} }
XrResult XrResult