diff --git a/Common/VR/VRBase.cpp b/Common/VR/VRBase.cpp index c6661f1cf0..ec4a44c703 100644 --- a/Common/VR/VRBase.cpp +++ b/Common/VR/VRBase.cpp @@ -65,17 +65,17 @@ void VR_Init( void* system, const char* name, int version ) { #endif std::vector extensions; - if (VR_GetPlatformFLag(VR_PLATFORM_RENDERER_VULKAN)) { + if (VR_GetPlatformFlag(VR_PLATFORM_RENDERER_VULKAN)) { extensions.push_back(XR_KHR_VULKAN_ENABLE_EXTENSION_NAME); } else { extensions.push_back(XR_KHR_OPENGL_ES_ENABLE_EXTENSION_NAME); } extensions.push_back(XR_KHR_COMPOSITION_LAYER_CYLINDER_EXTENSION_NAME); - if (VR_GetPlatformFLag(VR_PLATFORM_PERFORMANCE_EXT)) { + if (VR_GetPlatformFlag(VR_PLATFORM_PERFORMANCE_EXT)) { extensions.push_back(XR_EXT_PERFORMANCE_SETTINGS_EXTENSION_NAME); extensions.push_back(XR_KHR_ANDROID_THREAD_SETTINGS_EXTENSION_NAME); } - if (VR_GetPlatformFLag(VR_PLATFORM_PICO_INIT)) { + if (VR_GetPlatformFlag(VR_PLATFORM_PICO_INIT)) { extensions.push_back(XR_KHR_ANDROID_CREATE_INSTANCE_EXTENSION_NAME); extensions.push_back("XR_PICO_android_controller_function_ext_enable"); extensions.push_back("XR_PICO_view_state_ext_enable"); @@ -106,7 +106,7 @@ void VR_Init( void* system, const char* name, int version ) { #ifdef ANDROID XrInstanceCreateInfoAndroidKHR instanceCreateInfoAndroid = {XR_TYPE_INSTANCE_CREATE_INFO_ANDROID_KHR}; - if (VR_GetPlatformFLag(VR_PLATFORM_PICO_INIT)) { + if (VR_GetPlatformFlag(VR_PLATFORM_PICO_INIT)) { ovrJava* java = (ovrJava*)system; instanceCreateInfoAndroid.applicationVM = java->Vm; instanceCreateInfoAndroid.applicationActivity = java->ActivityObject; @@ -121,7 +121,7 @@ void VR_Init( void* system, const char* name, int version ) { exit(1); } - if (VR_GetPlatformFLag(VR_PLATFORM_PICO_INIT)) { + if (VR_GetPlatformFlag(VR_PLATFORM_PICO_INIT)) { xrGetInstanceProcAddr(vr_engine.appState.Instance, "xrSetEngineVersionPico", (PFN_xrVoidFunction*)(&pfnXrSetEngineVersionPico)); xrGetInstanceProcAddr(vr_engine.appState.Instance, "xrStartCVControllerThreadPico", (PFN_xrVoidFunction*)(&pfnXrStartCVControllerThreadPico)); xrGetInstanceProcAddr(vr_engine.appState.Instance, "xrStopCVControllerThreadPico", (PFN_xrVoidFunction*)(&pfnXrStopCVControllerThreadPico)); @@ -155,7 +155,7 @@ void VR_Init( void* system, const char* name, int version ) { } // Get the graphics requirements. - if (VR_GetPlatformFLag(VR_PLATFORM_RENDERER_VULKAN)) { + if (VR_GetPlatformFlag(VR_PLATFORM_RENDERER_VULKAN)) { PFN_xrGetVulkanGraphicsRequirementsKHR pfnGetVulkanGraphicsRequirementsKHR = NULL; OXR(xrGetInstanceProcAddr( vr_engine.appState.Instance, @@ -182,9 +182,11 @@ void VR_Init( void* system, const char* name, int version ) { vr_initialized = 1; } +#endif + void VR_Destroy( engine_t* engine ) { if (engine == &vr_engine) { - if (VR_GetPlatformFLag(VR_PLATFORM_PICO_INIT)) { + if (VR_GetPlatformFlag(VR_PLATFORM_PICO_INIT)) { if (pfnXrStopCVControllerThreadPico != nullptr) { pfnXrStopCVControllerThreadPico(engine->appState.Instance, PXR_TRACKING_6DOF, PXR_TRACKING_6DOF); } @@ -210,7 +212,7 @@ void VR_EnterVR( engine_t* engine, XrGraphicsBindingVulkanKHR* graphicsBindingVu XrGraphicsBindingOpenGLWin32KHR graphicsBindingGL = {}; #endif memset(&sessionCreateInfo, 0, sizeof(sessionCreateInfo)); - if (VR_GetPlatformFLag(VR_PLATFORM_RENDERER_VULKAN)) { + if (VR_GetPlatformFlag(VR_PLATFORM_RENDERER_VULKAN)) { sessionCreateInfo.next = graphicsBindingVulkan; } else { #ifdef ANDROID @@ -234,7 +236,7 @@ void VR_EnterVR( engine_t* engine, XrGraphicsBindingVulkanKHR* graphicsBindingVu ALOGE("Failed to create XR session: %d.", initResult); exit(1); } - if (VR_GetPlatformFLag(VR_PLATFORM_PICO_INIT)) { + if (VR_GetPlatformFlag(VR_PLATFORM_PICO_INIT)) { pfnXrSetConfigPICO(engine->appState.Session, TRACKING_ORIGIN, "1"); } @@ -264,12 +266,10 @@ engine_t* VR_GetEngine( void ) { return &vr_engine; } -bool VR_GetPlatformFLag(VRPlatformFlag flag) { +bool VR_GetPlatformFlag(VRPlatformFlag flag) { return vr_platform[flag]; } void VR_SetPlatformFLag(VRPlatformFlag flag, bool value) { vr_platform[flag] = value; } - -#endif diff --git a/Common/VR/VRBase.h b/Common/VR/VRBase.h index 4e0e1e266a..0893ac7f84 100644 --- a/Common/VR/VRBase.h +++ b/Common/VR/VRBase.h @@ -192,7 +192,7 @@ void VR_EnterVR( engine_t* engine, XrGraphicsBindingVulkanKHR* graphicsBindingVu void VR_LeaveVR( engine_t* engine ); engine_t* VR_GetEngine( void ); -bool VR_GetPlatformFLag(VRPlatformFlag flag); +bool VR_GetPlatformFlag(VRPlatformFlag flag); void VR_SetPlatformFLag(VRPlatformFlag flag, bool value); void ovrApp_Clear(ovrApp* app); diff --git a/Common/VR/VRFramebuffer.cpp b/Common/VR/VRFramebuffer.cpp index 2122191bec..1739e1a0de 100644 --- a/Common/VR/VRFramebuffer.cpp +++ b/Common/VR/VRFramebuffer.cpp @@ -241,7 +241,7 @@ static bool ovrFramebuffer_CreateVK(XrSession session, ovrFramebuffer* frameBuff } void ovrFramebuffer_Destroy(ovrFramebuffer* frameBuffer) { - if (VR_GetPlatformFLag(VR_PLATFORM_RENDERER_VULKAN)) { + if (VR_GetPlatformFlag(VR_PLATFORM_RENDERER_VULKAN)) { for (int i = 0; i < (int)frameBuffer->TextureSwapChainLength; i++) { vkDestroyImageView(frameBuffer->VKContext->device, frameBuffer->VKColorImages[i], nullptr); vkDestroyImageView(frameBuffer->VKContext->device, frameBuffer->VKDepthImages[i], nullptr); @@ -265,7 +265,7 @@ void ovrFramebuffer_Destroy(ovrFramebuffer* frameBuffer) { } void* ovrFramebuffer_SetCurrent(ovrFramebuffer* frameBuffer) { - if (VR_GetPlatformFLag(VR_PLATFORM_RENDERER_VULKAN)) { + if (VR_GetPlatformFlag(VR_PLATFORM_RENDERER_VULKAN)) { return (void *)frameBuffer->VKFrameBuffers[frameBuffer->TextureSwapChainIndex]; } else { #if XR_USE_GRAPHICS_API_OPENGL_ES || XR_USE_GRAPHICS_API_OPENGL @@ -297,7 +297,7 @@ void ovrFramebuffer_Acquire(ovrFramebuffer* frameBuffer) { ovrFramebuffer_SetCurrent(frameBuffer); - if (VR_GetPlatformFLag(VR_PLATFORM_RENDERER_VULKAN)) { + if (VR_GetPlatformFlag(VR_PLATFORM_RENDERER_VULKAN)) { //TODO:implement } else { #if XR_USE_GRAPHICS_API_OPENGL_ES || XR_USE_GRAPHICS_API_OPENGL @@ -319,7 +319,7 @@ void ovrFramebuffer_Release(ovrFramebuffer* frameBuffer) { frameBuffer->Acquired = false; // Clear the alpha channel, other way OpenXR would not transfer the framebuffer fully - if (VR_GetPlatformFLag(VR_PLATFORM_RENDERER_VULKAN)) { + if (VR_GetPlatformFlag(VR_PLATFORM_RENDERER_VULKAN)) { //TODO:implement } else { #if XR_USE_GRAPHICS_API_OPENGL_ES || XR_USE_GRAPHICS_API_OPENGL @@ -370,7 +370,7 @@ void ovrRenderer_Destroy(ovrRenderer* renderer) { } void ovrRenderer_MouseCursor(ovrRenderer* renderer, int x, int y, int size) { - if (VR_GetPlatformFLag(VR_PLATFORM_RENDERER_VULKAN)) { + if (VR_GetPlatformFlag(VR_PLATFORM_RENDERER_VULKAN)) { //TODO:implement } else { #if XR_USE_GRAPHICS_API_OPENGL_ES || XR_USE_GRAPHICS_API_OPENGL @@ -433,7 +433,7 @@ void ovrApp_HandleSessionStateChanges(ovrApp* app, XrSessionState state) { app->SessionActive = (result == XR_SUCCESS); #ifdef ANDROID - if (app->SessionActive && VR_GetPlatformFLag(VR_PLATFORM_PERFORMANCE_EXT)) { + if (app->SessionActive && VR_GetPlatformFlag(VR_PLATFORM_PERFORMANCE_EXT)) { XrPerfSettingsLevelEXT cpuPerfLevel = XR_PERF_SETTINGS_LEVEL_BOOST_EXT; XrPerfSettingsLevelEXT gpuPerfLevel = XR_PERF_SETTINGS_LEVEL_BOOST_EXT; diff --git a/Common/VR/VRInput.cpp b/Common/VR/VRInput.cpp index 912bbca17f..dec132ab34 100644 --- a/Common/VR/VRInput.cpp +++ b/Common/VR/VRInput.cpp @@ -266,9 +266,9 @@ void IN_VRInit( engine_t *engine ) { handPoseRightAction = CreateAction(runningActionSet, XR_ACTION_TYPE_POSE_INPUT, "hand_pose_right", NULL, 1, &rightHandPath); XrPath interactionProfilePath = XR_NULL_PATH; - if (VR_GetPlatformFLag(VR_PLATFORM_CONTROLLER_QUEST)) { + if (VR_GetPlatformFlag(VR_PLATFORM_CONTROLLER_QUEST)) { OXR(xrStringToPath(engine->appState.Instance, "/interaction_profiles/oculus/touch_controller", &interactionProfilePath)); - } else if (VR_GetPlatformFLag(VR_PLATFORM_CONTROLLER_PICO)) { + } else if (VR_GetPlatformFlag(VR_PLATFORM_CONTROLLER_PICO)) { OXR(xrStringToPath(engine->appState.Instance, "/interaction_profiles/pico/neo3_controller", &interactionProfilePath)); } @@ -277,11 +277,11 @@ void IN_VRInit( engine_t *engine ) { int currBinding = 0; - if (VR_GetPlatformFLag(VR_PLATFORM_CONTROLLER_QUEST)) { + if (VR_GetPlatformFlag(VR_PLATFORM_CONTROLLER_QUEST)) { bindings[currBinding++] = ActionSuggestedBinding(indexLeftAction, "/user/hand/left/input/trigger"); bindings[currBinding++] = ActionSuggestedBinding(indexRightAction, "/user/hand/right/input/trigger"); bindings[currBinding++] = ActionSuggestedBinding(menuAction, "/user/hand/left/input/menu/click"); - } else if (VR_GetPlatformFLag(VR_PLATFORM_CONTROLLER_PICO)) { + } else if (VR_GetPlatformFlag(VR_PLATFORM_CONTROLLER_PICO)) { bindings[currBinding++] = ActionSuggestedBinding(indexLeftAction, "/user/hand/left/input/trigger/click"); bindings[currBinding++] = ActionSuggestedBinding(indexRightAction, "/user/hand/right/input/trigger/click"); bindings[currBinding++] = ActionSuggestedBinding(menuAction, "/user/hand/left/input/back/click"); diff --git a/Common/VR/VRRenderer.cpp b/Common/VR/VRRenderer.cpp index 50fc4c0003..6895ad024f 100644 --- a/Common/VR/VRRenderer.cpp +++ b/Common/VR/VRRenderer.cpp @@ -154,7 +154,7 @@ void VR_Recenter(engine_t* engine) { // Create a default stage space to use if SPACE_TYPE_STAGE is not // supported, or calls to xrGetReferenceSpaceBoundsRect fail. spaceCreateInfo.referenceSpaceType = XR_REFERENCE_SPACE_TYPE_LOCAL; - if (VR_GetPlatformFLag(VR_PLATFORM_TRACKING_FLOOR)) { + if (VR_GetPlatformFlag(VR_PLATFORM_TRACKING_FLOOR)) { spaceCreateInfo.poseInReferenceSpace.position.y = -1.6750f; } OXR(xrCreateReferenceSpace(engine->appState.Session, &spaceCreateInfo, &engine->appState.FakeStageSpace)); @@ -166,7 +166,7 @@ void VR_Recenter(engine_t* engine) { spaceCreateInfo.poseInReferenceSpace.position.y = 0.0; OXR(xrCreateReferenceSpace(engine->appState.Session, &spaceCreateInfo, &engine->appState.StageSpace)); ALOGV("Created stage space"); - if (VR_GetPlatformFLag(VR_PLATFORM_TRACKING_FLOOR)) { + if (VR_GetPlatformFlag(VR_PLATFORM_TRACKING_FLOOR)) { engine->appState.CurrentSpace = engine->appState.StageSpace; } } @@ -211,7 +211,7 @@ void VR_InitRenderer( engine_t* engine, bool multiview ) { projections = (XrView*)(malloc(ovrMaxNumEyes * sizeof(XrView))); void* vulkanContext = nullptr; - if (VR_GetPlatformFLag(VR_PLATFORM_RENDERER_VULKAN)) { + if (VR_GetPlatformFlag(VR_PLATFORM_RENDERER_VULKAN)) { vulkanContext = &engine->graphicsBindingVulkan; } ovrRenderer_Create(engine->appState.Session, &engine->appState.Renderer,