From 60d8a102f9259802b6b4f85a39ae4db34fe14111 Mon Sep 17 00:00:00 2001 From: Lubos Date: Fri, 29 Jul 2022 10:19:11 +0200 Subject: [PATCH] OpenXR - Switching between 2D/VR fixed --- Common/GPU/OpenGL/GLRenderManager.cpp | 2 +- GPU/GLES/ShaderManagerGLES.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Common/GPU/OpenGL/GLRenderManager.cpp b/Common/GPU/OpenGL/GLRenderManager.cpp index c1bf059c31..7169bebeab 100644 --- a/Common/GPU/OpenGL/GLRenderManager.cpp +++ b/Common/GPU/OpenGL/GLRenderManager.cpp @@ -213,7 +213,7 @@ bool GLRenderManager::ThreadFrame() { VR_BeginFrame(VR_GetEngine()); // Decide if the scene is 3D or not - if (g_Config.bEnableVR && (VR_GetConfig(VR_CONFIG_3D_GEOMETRY_COUNT) > 100)) { + if (g_Config.bEnableVR && (VR_GetConfig(VR_CONFIG_3D_GEOMETRY_COUNT) > 15)) { VR_SetConfig(VR_CONFIG_MODE, VR_MODE_MONO_6DOF); } else { VR_SetConfig(VR_CONFIG_MODE, VR_MODE_FLAT_SCREEN); diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp index 97d1cf8143..a111f1cd49 100644 --- a/GPU/GLES/ShaderManagerGLES.cpp +++ b/GPU/GLES/ShaderManagerGLES.cpp @@ -317,6 +317,7 @@ void LinkedShader::UpdateUniforms(u32 vertType, const ShaderID &vsid, bool useBu #ifdef OPENXR float e = 0.00001f; + bool ortho = true; bool identity = true; bool oneTranslation = true; for (int i = 0; i < 4; i++) { @@ -327,11 +328,13 @@ void LinkedShader::UpdateUniforms(u32 vertType, const ShaderID &vsid, bool useBu if ((i != j) && (fabs(value) > e)) identity = false; // Other number than one on diagonale if ((i == j) && (fabs(value - 1.0f) > e)) identity = false; + // Special case detecting UI in Flatout + if ((i == j) && (i < 2) && (fabs(value) < 10.0f)) ortho = false; // Special case detecting UI in Lego games if (((i == 3) && (fabs(fabs(value) - 1.0f) > e))) oneTranslation = false; } } - bool is2D = identity || oneTranslation; + bool is2D = identity || oneTranslation || ortho; if (!is2D) { VR_SetConfig(VR_CONFIG_3D_GEOMETRY_COUNT, VR_GetConfig(VR_CONFIG_3D_GEOMETRY_COUNT) + 1); }