OpenXR - OPENXR ifdef removal

This commit is contained in:
Lubos committed 2022-08-27 17:33:37 +02:00
1 parent 5e434bccdb
commit c2c0561be2
16 files changed
+415 -306

No files matched your search

+4 -14
View File
@@ -78,6 +78,7 @@
#include "Common/GraphicsContext.h"
#include "Common/OSVersion.h"
#include "Common/GPU/ShaderTranslation.h"
#include "Common/VR/PPSSPPVR.h"
#include "Core/ControlMapper.h"
#include "Core/Config.h"
@@ -142,10 +143,6 @@
#include <mach-o/dyld.h>
#endif
#ifdef OPENXR
#include "VR/VRRenderer.h"
#endif
ScreenManager *screenManager;
std::string config_filename;
@@ -1302,17 +1299,10 @@ bool NativeTouch(const TouchInput &touch) {
bool NativeKey(const KeyInput &key) {
// Hack to quick enable 2D mode in VR game mode.
#ifdef OPENXR
std::vector<int> nativeKeys;
if (KeyMap::KeyToPspButton(key.deviceId, key.keyCode, &nativeKeys)) {
for (int& nativeKey : nativeKeys) {
if (nativeKey == CTRL_SCREEN) {
VR_SetConfig(VR_CONFIG_FORCE_2D, key.flags & KEY_DOWN);
}
}
// Hack to quickly enable 2D mode in VR game mode.
if (IsVRBuild()) {
UpdateVRScreenKey(key);
}
#endif
// INFO_LOG(SYSTEM, "Key code: %i flags: %i", key.keyCode, key.flags);
#if !defined(MOBILE_DEVICE)