[vr] moved layers into a separate 'layers' directory

src/android/app/src/main/jni/CMakeLists.txt

@@ -32,12 +32,13 @@ add_library(citra-android SHARED
     native.h
     ndk_motion.cpp
     ndk_motion.h
-    vr/CursorLayer.cpp
+    # VR-specific
     vr/vr_main.cpp
     vr/OpenXR.cpp
     vr/gl/Egl.cpp
-    vr/GameSurfaceLayer.cpp
     vr/XrController.cpp
+    vr/layers/GameSurfaceLayer.cpp
+    vr/layers/CursorLayer.cpp
     vr/utils/JniUtils.cpp
 )
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-enum-enum-conversion")

src/android/app/src/main/jni/vr/layers/CursorLayer.cpp

@@ -10,9 +10,9 @@ License     :   Licensed under GPLv2 or any later version.
 
 #include "CursorLayer.h"
 
-#include "OpenXR.h"
-#include "utils/LogUtils.h"
-#include "utils/XrMath.h"
+#include "../OpenXR.h"
+#include "../utils/LogUtils.h"
+#include "../utils/XrMath.h"
 
 namespace {
 

src/android/app/src/main/jni/vr/layers/CursorLayer.h

@@ -10,7 +10,7 @@ License     :   Licensed under GPLv2 or any later version.
 
 #pragma once
 
-#include "Swapchain.h"
+#include "../Swapchain.h"
 
 #include <jni.h> // needed for openxr_platform.h when XR_USE_PLATFORM_ANDROID is defined
 

src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp

@@ -14,10 +14,10 @@ License     :   Licensed under GPLv2 or any later version.
 
 #include "GameSurfaceLayer.h"
 
-#include "utils/JniUtils.h"
-#include "utils/LogUtils.h"
-#include "utils/SyspropUtils.h"
-#include "utils/XrMath.h"
+#include "../utils/JniUtils.h"
+#include "../utils/LogUtils.h"
+#include "../utils/SyspropUtils.h"
+#include "../utils/XrMath.h"
 
 #include <EGL/egl.h>
 #include <GLES3/gl3.h>

src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.h

@@ -52,10 +52,10 @@ License     :   Licensed under GPLv2 or any later version.
 *******************************************************************************/
 #pragma once
 
-#include "../../../../../../core/3ds.h" // for 3ds screen sizes.
-#include "OpenXR.h"
-#include "Swapchain.h"
-#include "utils/Common.h"
+#include "core/3ds.h" // for 3ds screen sizes.
+#include "../OpenXR.h"
+#include "../Swapchain.h"
+#include "../utils/Common.h"
 
 #include <jni.h>
 

src/android/app/src/main/jni/vr/vr_main.cpp

@@ -13,8 +13,8 @@ License     :   Licensed under GPLv2 or any later version.
 #include "OpenXR.h"
 #include "utils/LogUtils.h"
 
-#include "CursorLayer.h"
-#include "GameSurfaceLayer.h"
+#include "layers/CursorLayer.h"
+#include "layers/GameSurfaceLayer.h"
 #include "XrController.h"
 #include "utils/Common.h"
 #include "utils/XrMath.h"