Skip to content

Commit

Permalink
OpenXR - Add Error code in the error messages when creating a new Ope…
Browse files Browse the repository at this point in the history 
…nXR instance and a new OpenXR Session
  • Loading branch information
@MadDeCoDeR
MadDeCoDeR committed Dec 30, 2024
1 parent 104beac commit 878cdd9
Show file tree
Hide file tree
Showing 2 changed files with 143 additions and 5 deletions.
8 changes: 8 additions & 0 deletions neo/CMakePresets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,14 @@
"INSIDE_PACKAGE": {
"type": "BOOL",
"value": "ON"
},
"USE_OPENXR": {
"type": "BOOL",
"value": "ON"
},
"CMAKE_DISABLE_FIND_PACKAGE_jsoncpp" : {
"type": "BOOL",
"value": "ON"
}
}
},
Expand Down
140 changes: 135 additions & 5 deletions neo/renderer/OpenXR/oxrImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,143 @@
*/
#include "precompiled.h"
#include "oxrImpl.h"
#include <map>
idCVar vr_recordInitialPosition("vr_recordInitialPosition", "1", CVAR_BOOL, "Boolean to Determine if the current HMD Input must be recorded for initial Position");
extern idCVar in_invertLook;

idXRLocal xrLocalSystem;
idXR* xrSystem = &xrLocalSystem;

std::map<XrResult, std::string> XrResultMap = {
{XR_SUCCESS, "XR_SUCCESS"},
{XR_TIMEOUT_EXPIRED, "XR_TIMEOUT_EXPIRED"},
{XR_SESSION_LOSS_PENDING, "XR_SESSION_LOSS_PENDING"},
{XR_EVENT_UNAVAILABLE, "XR_EVENT_UNAVAILABLE"},
{XR_SPACE_BOUNDS_UNAVAILABLE, "XR_SPACE_BOUNDS_UNAVAILABLE"},
{XR_SESSION_NOT_FOCUSED, "XR_SESSION_NOT_FOCUSED"},
{XR_FRAME_DISCARDED, "XR_FRAME_DISCARDED"},
{XR_ERROR_VALIDATION_FAILURE, "XR_ERROR_VALIDATION_FAILURE"},
{XR_ERROR_RUNTIME_FAILURE, "XR_ERROR_RUNTIME_FAILURE"},
{XR_ERROR_OUT_OF_MEMORY, "XR_ERROR_OUT_OF_MEMORY"},
{XR_ERROR_API_VERSION_UNSUPPORTED, "XR_ERROR_API_VERSION_UNSUPPORTED"},
{XR_ERROR_INITIALIZATION_FAILED, "XR_ERROR_INITIALIZATION_FAILED"},
{XR_ERROR_FUNCTION_UNSUPPORTED, "XR_ERROR_FUNCTION_UNSUPPORTED"},
{XR_ERROR_FEATURE_UNSUPPORTED, "XR_ERROR_FEATURE_UNSUPPORTED"},
{XR_ERROR_EXTENSION_NOT_PRESENT, "XR_ERROR_EXTENSION_NOT_PRESENT"},
{XR_ERROR_LIMIT_REACHED, "XR_ERROR_LIMIT_REACHED"},
{XR_ERROR_SIZE_INSUFFICIENT, "XR_ERROR_SIZE_INSUFFICIENT"},
{XR_ERROR_HANDLE_INVALID, "XR_ERROR_HANDLE_INVALID"},
{XR_ERROR_INSTANCE_LOST, "XR_ERROR_INSTANCE_LOST"},
{XR_ERROR_SESSION_RUNNING, "XR_ERROR_SESSION_RUNNING"},
{XR_ERROR_SESSION_NOT_RUNNING, "XR_ERROR_SESSION_NOT_RUNNING"},
{XR_ERROR_SESSION_LOST, "XR_ERROR_SESSION_LOST"},
{XR_ERROR_SYSTEM_INVALID, "XR_ERROR_SYSTEM_INVALID"},
{XR_ERROR_PATH_INVALID, "XR_ERROR_PATH_INVALID"},
{XR_ERROR_PATH_COUNT_EXCEEDED, "XR_ERROR_PATH_COUNT_EXCEEDED"},
{XR_ERROR_PATH_FORMAT_INVALID, "XR_ERROR_PATH_FORMAT_INVALID"},
{XR_ERROR_PATH_UNSUPPORTED, "XR_ERROR_PATH_UNSUPPORTED"},
{XR_ERROR_LAYER_INVALID, "XR_ERROR_LAYER_INVALID"},
{XR_ERROR_LAYER_LIMIT_EXCEEDED, "XR_ERROR_LAYER_LIMIT_EXCEEDED"},
{XR_ERROR_SWAPCHAIN_RECT_INVALID, "XR_ERROR_SWAPCHAIN_RECT_INVALID"},
{XR_ERROR_SWAPCHAIN_FORMAT_UNSUPPORTED, "XR_ERROR_SWAPCHAIN_FORMAT_UNSUPPORTED"},
{XR_ERROR_ACTION_TYPE_MISMATCH, "XR_ERROR_ACTION_TYPE_MISMATCH"},
{XR_ERROR_SESSION_NOT_READY, "XR_ERROR_SESSION_NOT_READY"},
{XR_ERROR_SESSION_NOT_STOPPING, "XR_ERROR_SESSION_NOT_STOPPING"},
{XR_ERROR_TIME_INVALID, "XR_ERROR_TIME_INVALID"},
{XR_ERROR_REFERENCE_SPACE_UNSUPPORTED, "XR_ERROR_REFERENCE_SPACE_UNSUPPORTED"},
{XR_ERROR_FILE_ACCESS_ERROR, "XR_ERROR_FILE_ACCESS_ERROR"},
{XR_ERROR_FILE_CONTENTS_INVALID, "XR_ERROR_FILE_CONTENTS_INVALID"},
{XR_ERROR_FORM_FACTOR_UNSUPPORTED, "XR_ERROR_FORM_FACTOR_UNSUPPORTED"},
{XR_ERROR_FORM_FACTOR_UNAVAILABLE, "XR_ERROR_FORM_FACTOR_UNAVAILABLE"},
{XR_ERROR_API_LAYER_NOT_PRESENT, "XR_ERROR_API_LAYER_NOT_PRESENT"},
{XR_ERROR_CALL_ORDER_INVALID, "XR_ERROR_CALL_ORDER_INVALID"},
{XR_ERROR_GRAPHICS_DEVICE_INVALID, "XR_ERROR_GRAPHICS_DEVICE_INVALID"},
{XR_ERROR_POSE_INVALID, "XR_ERROR_POSE_INVALID"},
{XR_ERROR_INDEX_OUT_OF_RANGE, "XR_ERROR_INDEX_OUT_OF_RANGE"},
{XR_ERROR_VIEW_CONFIGURATION_TYPE_UNSUPPORTED, "XR_ERROR_VIEW_CONFIGURATION_TYPE_UNSUPPORTED"},
{XR_ERROR_ENVIRONMENT_BLEND_MODE_UNSUPPORTED, "XR_ERROR_ENVIRONMENT_BLEND_MODE_UNSUPPORTED"},
{XR_ERROR_NAME_DUPLICATED, "XR_ERROR_NAME_DUPLICATED"},
{XR_ERROR_NAME_INVALID, "XR_ERROR_NAME_INVALID"},
{XR_ERROR_ACTIONSET_NOT_ATTACHED, "XR_ERROR_ACTIONSET_NOT_ATTACHED"},
{XR_ERROR_ACTIONSETS_ALREADY_ATTACHED, "XR_ERROR_ACTIONSETS_ALREADY_ATTACHED"},
{XR_ERROR_LOCALIZED_NAME_DUPLICATED, "XR_ERROR_LOCALIZED_NAME_DUPLICATED"},
{XR_ERROR_LOCALIZED_NAME_INVALID, "XR_ERROR_LOCALIZED_NAME_INVALID"},
{XR_ERROR_GRAPHICS_REQUIREMENTS_CALL_MISSING, "XR_ERROR_GRAPHICS_REQUIREMENTS_CALL_MISSING"},
{XR_ERROR_RUNTIME_UNAVAILABLE, "XR_ERROR_RUNTIME_UNAVAILABLE"},
{XR_ERROR_EXTENSION_DEPENDENCY_NOT_ENABLED, "XR_ERROR_EXTENSION_DEPENDENCY_NOT_ENABLED"},
{XR_ERROR_PERMISSION_INSUFFICIENT, "XR_ERROR_PERMISSION_INSUFFICIENT"},
{XR_ERROR_ANDROID_THREAD_SETTINGS_ID_INVALID_KHR, "XR_ERROR_ANDROID_THREAD_SETTINGS_ID_INVALID_KHR"},
{XR_ERROR_ANDROID_THREAD_SETTINGS_FAILURE_KHR, "XR_ERROR_ANDROID_THREAD_SETTINGS_FAILURE_KHR"},
{XR_ERROR_CREATE_SPATIAL_ANCHOR_FAILED_MSFT, "XR_ERROR_CREATE_SPATIAL_ANCHOR_FAILED_MSFT"},
{XR_ERROR_SECONDARY_VIEW_CONFIGURATION_TYPE_NOT_ENABLED_MSFT, "XR_ERROR_SECONDARY_VIEW_CONFIGURATION_TYPE_NOT_ENABLED_MSFT"},
{XR_ERROR_CONTROLLER_MODEL_KEY_INVALID_MSFT, "XR_ERROR_CONTROLLER_MODEL_KEY_INVALID_MSFT"},
{XR_ERROR_REPROJECTION_MODE_UNSUPPORTED_MSFT, "XR_ERROR_REPROJECTION_MODE_UNSUPPORTED_MSFT"},
{XR_ERROR_COMPUTE_NEW_SCENE_NOT_COMPLETED_MSFT, "XR_ERROR_COMPUTE_NEW_SCENE_NOT_COMPLETED_MSFT"},
{XR_ERROR_SCENE_COMPONENT_ID_INVALID_MSFT, "XR_ERROR_SCENE_COMPONENT_ID_INVALID_MSFT"},
{XR_ERROR_SCENE_COMPONENT_TYPE_MISMATCH_MSFT, "XR_ERROR_SCENE_COMPONENT_TYPE_MISMATCH_MSFT"},
{XR_ERROR_SCENE_MESH_BUFFER_ID_INVALID_MSFT, "XR_ERROR_SCENE_MESH_BUFFER_ID_INVALID_MSFT"},
{XR_ERROR_SCENE_COMPUTE_FEATURE_INCOMPATIBLE_MSFT, "XR_ERROR_SCENE_COMPUTE_FEATURE_INCOMPATIBLE_MSFT"},
{XR_ERROR_SCENE_COMPUTE_CONSISTENCY_MISMATCH_MSFT, "XR_ERROR_SCENE_COMPUTE_CONSISTENCY_MISMATCH_MSFT"},
{XR_ERROR_DISPLAY_REFRESH_RATE_UNSUPPORTED_FB, "XR_ERROR_DISPLAY_REFRESH_RATE_UNSUPPORTED_FB"},
{XR_ERROR_COLOR_SPACE_UNSUPPORTED_FB, "XR_ERROR_COLOR_SPACE_UNSUPPORTED_FB"},
{XR_ERROR_SPACE_COMPONENT_NOT_SUPPORTED_FB, "XR_ERROR_SPACE_COMPONENT_NOT_SUPPORTED_FB"},
{XR_ERROR_SPACE_COMPONENT_NOT_ENABLED_FB, "XR_ERROR_SPACE_COMPONENT_NOT_ENABLED_FB"},
{XR_ERROR_SPACE_COMPONENT_STATUS_PENDING_FB, "XR_ERROR_SPACE_COMPONENT_STATUS_PENDING_FB"},
{XR_ERROR_SPACE_COMPONENT_STATUS_ALREADY_SET_FB, "XR_ERROR_SPACE_COMPONENT_STATUS_ALREADY_SET_FB"},
{XR_ERROR_UNEXPECTED_STATE_PASSTHROUGH_FB, "XR_ERROR_UNEXPECTED_STATE_PASSTHROUGH_FB"},
{XR_ERROR_FEATURE_ALREADY_CREATED_PASSTHROUGH_FB, "XR_ERROR_FEATURE_ALREADY_CREATED_PASSTHROUGH_FB"},
{XR_ERROR_FEATURE_REQUIRED_PASSTHROUGH_FB, "XR_ERROR_FEATURE_REQUIRED_PASSTHROUGH_FB"},
{XR_ERROR_NOT_PERMITTED_PASSTHROUGH_FB, "XR_ERROR_NOT_PERMITTED_PASSTHROUGH_FB"},
{XR_ERROR_INSUFFICIENT_RESOURCES_PASSTHROUGH_FB, "XR_ERROR_INSUFFICIENT_RESOURCES_PASSTHROUGH_FB"},
{XR_ERROR_UNKNOWN_PASSTHROUGH_FB, "XR_ERROR_UNKNOWN_PASSTHROUGH_FB"},
{XR_ERROR_RENDER_MODEL_KEY_INVALID_FB, "XR_ERROR_RENDER_MODEL_KEY_INVALID_FB"},
{XR_RENDER_MODEL_UNAVAILABLE_FB, "XR_RENDER_MODEL_UNAVAILABLE_FB"},
{XR_ERROR_MARKER_NOT_TRACKED_VARJO, "XR_ERROR_MARKER_NOT_TRACKED_VARJO"},
{XR_ERROR_MARKER_ID_INVALID_VARJO, "XR_ERROR_MARKER_ID_INVALID_VARJO"},
{XR_ERROR_MARKER_DETECTOR_PERMISSION_DENIED_ML, "XR_ERROR_MARKER_DETECTOR_PERMISSION_DENIED_ML"},
{XR_ERROR_MARKER_DETECTOR_LOCATE_FAILED_ML, "XR_ERROR_MARKER_DETECTOR_LOCATE_FAILED_ML"},
{XR_ERROR_MARKER_DETECTOR_INVALID_DATA_QUERY_ML, "XR_ERROR_MARKER_DETECTOR_INVALID_DATA_QUERY_ML"},
{XR_ERROR_MARKER_DETECTOR_INVALID_CREATE_INFO_ML, "XR_ERROR_MARKER_DETECTOR_INVALID_CREATE_INFO_ML"},
{XR_ERROR_MARKER_INVALID_ML, "XR_ERROR_MARKER_INVALID_ML"},
{XR_ERROR_LOCALIZATION_MAP_INCOMPATIBLE_ML, "XR_ERROR_LOCALIZATION_MAP_INCOMPATIBLE_ML"},
{XR_ERROR_LOCALIZATION_MAP_UNAVAILABLE_ML, "XR_ERROR_LOCALIZATION_MAP_UNAVAILABLE_ML"},
{XR_ERROR_LOCALIZATION_MAP_FAIL_ML, "XR_ERROR_LOCALIZATION_MAP_FAIL_ML"},
{XR_ERROR_LOCALIZATION_MAP_IMPORT_EXPORT_PERMISSION_DENIED_ML, "XR_ERROR_LOCALIZATION_MAP_IMPORT_EXPORT_PERMISSION_DENIED_ML"},
{XR_ERROR_LOCALIZATION_MAP_PERMISSION_DENIED_ML, "XR_ERROR_LOCALIZATION_MAP_PERMISSION_DENIED_ML"},
{XR_ERROR_LOCALIZATION_MAP_ALREADY_EXISTS_ML, "XR_ERROR_LOCALIZATION_MAP_ALREADY_EXISTS_ML"},
{XR_ERROR_LOCALIZATION_MAP_CANNOT_EXPORT_CLOUD_MAP_ML, "XR_ERROR_LOCALIZATION_MAP_CANNOT_EXPORT_CLOUD_MAP_ML"},
{XR_ERROR_SPATIAL_ANCHORS_PERMISSION_DENIED_ML, "XR_ERROR_SPATIAL_ANCHORS_PERMISSION_DENIED_ML"},
{XR_ERROR_SPATIAL_ANCHORS_NOT_LOCALIZED_ML, "XR_ERROR_SPATIAL_ANCHORS_NOT_LOCALIZED_ML"},
{XR_ERROR_SPATIAL_ANCHORS_OUT_OF_MAP_BOUNDS_ML, "XR_ERROR_SPATIAL_ANCHORS_OUT_OF_MAP_BOUNDS_ML"},
{XR_ERROR_SPATIAL_ANCHORS_SPACE_NOT_LOCATABLE_ML, "XR_ERROR_SPATIAL_ANCHORS_SPACE_NOT_LOCATABLE_ML"},
{XR_ERROR_SPATIAL_ANCHORS_ANCHOR_NOT_FOUND_ML, "XR_ERROR_SPATIAL_ANCHORS_ANCHOR_NOT_FOUND_ML"},
{XR_ERROR_SPATIAL_ANCHOR_NAME_NOT_FOUND_MSFT, "XR_ERROR_SPATIAL_ANCHOR_NAME_NOT_FOUND_MSFT"},
{XR_ERROR_SPATIAL_ANCHOR_NAME_INVALID_MSFT, "XR_ERROR_SPATIAL_ANCHOR_NAME_INVALID_MSFT"},
{XR_SCENE_MARKER_DATA_NOT_STRING_MSFT, "XR_SCENE_MARKER_DATA_NOT_STRING_MSFT"},
{XR_ERROR_SPACE_MAPPING_INSUFFICIENT_FB, "XR_ERROR_SPACE_MAPPING_INSUFFICIENT_FB"},
{XR_ERROR_SPACE_LOCALIZATION_FAILED_FB, "XR_ERROR_SPACE_LOCALIZATION_FAILED_FB"},
{XR_ERROR_SPACE_NETWORK_TIMEOUT_FB, "XR_ERROR_SPACE_NETWORK_TIMEOUT_FB"},
{XR_ERROR_SPACE_NETWORK_REQUEST_FAILED_FB, "XR_ERROR_SPACE_NETWORK_REQUEST_FAILED_FB"},
{XR_ERROR_SPACE_CLOUD_STORAGE_DISABLED_FB, "XR_ERROR_SPACE_CLOUD_STORAGE_DISABLED_FB"},
{XR_ERROR_PASSTHROUGH_COLOR_LUT_BUFFER_SIZE_MISMATCH_META, "XR_ERROR_PASSTHROUGH_COLOR_LUT_BUFFER_SIZE_MISMATCH_META"},
{XR_ENVIRONMENT_DEPTH_NOT_AVAILABLE_META, "XR_ENVIRONMENT_DEPTH_NOT_AVAILABLE_META"},
{XR_ERROR_HINT_ALREADY_SET_QCOM, "XR_ERROR_HINT_ALREADY_SET_QCOM"},
{XR_ERROR_NOT_AN_ANCHOR_HTC, "XR_ERROR_NOT_AN_ANCHOR_HTC"},
{XR_ERROR_SPACE_NOT_LOCATABLE_EXT, "XR_ERROR_SPACE_NOT_LOCATABLE_EXT"},
{XR_ERROR_PLANE_DETECTION_PERMISSION_DENIED_EXT, "XR_ERROR_PLANE_DETECTION_PERMISSION_DENIED_EXT"},
{XR_ERROR_FUTURE_PENDING_EXT, "XR_ERROR_FUTURE_PENDING_EXT"},
{XR_ERROR_FUTURE_INVALID_EXT, "XR_ERROR_FUTURE_INVALID_EXT"},
{XR_ERROR_SYSTEM_NOTIFICATION_PERMISSION_DENIED_ML, "XR_ERROR_SYSTEM_NOTIFICATION_PERMISSION_DENIED_ML"},
{XR_ERROR_SYSTEM_NOTIFICATION_INCOMPATIBLE_SKU_ML, "XR_ERROR_SYSTEM_NOTIFICATION_INCOMPATIBLE_SKU_ML"},
{XR_ERROR_WORLD_MESH_DETECTOR_PERMISSION_DENIED_ML, "XR_ERROR_WORLD_MESH_DETECTOR_PERMISSION_DENIED_ML"},
{XR_ERROR_WORLD_MESH_DETECTOR_SPACE_NOT_LOCATABLE_ML, "XR_ERROR_WORLD_MESH_DETECTOR_SPACE_NOT_LOCATABLE_ML"},
{XR_ERROR_FACIAL_EXPRESSION_PERMISSION_DENIED_ML, "XR_ERROR_FACIAL_EXPRESSION_PERMISSION_DENIED_ML"},
{XR_ERROR_COLOCATION_DISCOVERY_NETWORK_FAILED_META, "XR_ERROR_COLOCATION_DISCOVERY_NETWORK_FAILED_META"},
{XR_ERROR_COLOCATION_DISCOVERY_NO_DISCOVERY_METHOD_META, "XR_ERROR_COLOCATION_DISCOVERY_NO_DISCOVERY_METHOD_META"},
{XR_COLOCATION_DISCOVERY_ALREADY_ADVERTISING_META, "XR_COLOCATION_DISCOVERY_ALREADY_ADVERTISING_META"},
{XR_COLOCATION_DISCOVERY_ALREADY_DISCOVERING_META, "XR_COLOCATION_DISCOVERY_ALREADY_DISCOVERING_META"},
{XR_ERROR_SPACE_GROUP_NOT_FOUND_META, "XR_ERROR_SPACE_GROUP_NOT_FOUND_META"}};

XrBool32 DebugXR(XrDebugUtilsMessageSeverityFlagsEXT messageSeverity, XrDebugUtilsMessageTypeFlagsEXT messageType, const XrDebugUtilsMessengerCallbackDataEXT* pCallbackData, void* pUserData) {
// it probably isn't safe to do an idLib::Printf at this point
idStr typeStr = "";
Expand Down Expand Up @@ -645,8 +776,6 @@ void* idXRLocal::CreateFrameBuffer(const FrameBufferCreateInfo& FbCI)
return (void*)(uint64_t)fb;
}



bool idXRLocal::InitXR() {
XrApplicationInfo XRAppInfo;
strncpy(XRAppInfo.applicationName, "DOOM BFA\0", 9);
Expand Down Expand Up @@ -727,7 +856,7 @@ bool idXRLocal::InitXR() {
result = xrCreateInstance(&ici, &instance);
}
if (result != XR_SUCCESS) {
common->Warning("OpenXR Error: Failed to initiate Instace");
common->Warning("OpenXR Error: Failed to initiate Instace with Error code: %s", XrResultMap[result]);
return false;
}

Expand Down Expand Up @@ -821,8 +950,9 @@ bool idXRLocal::InitXR() {
sci.next = GetOpenXRGraphicsBinding();
sci.createFlags = 0;
sci.systemId = systemId;
if (xrCreateSession(instance, &sci, &session) != XR_SUCCESS) {
common->Warning("OpenXR Error: Failed to create Session");
XrResult sessionResult = xrCreateSession(instance, &sci, &session);
if (sessionResult != XR_SUCCESS) {
common->Warning("OpenXR Error: Failed to create Session with Error code: %s", XrResultMap[sessionResult]);
return false;
}
float refreshRate = 60.0f;
Expand Down

0 comments on commit 878cdd9

Please sign in to comment.