OpenXR - OPENXR ifdef removal

This commit is contained in:
Lubos
2022-08-27 17:33:37 +02:00
parent 5e434bccdb
commit c2c0561be2
16 changed files with 415 additions and 306 deletions
+6 -4
View File
@@ -25,6 +25,7 @@
#include "Common/System/System.h"
#include "Common/Data/Format/IniFile.h"
#include "Common/Input/InputState.h"
#include "Common/VR/PPSSPPVR.h"
#include "Common/Log.h"
#include "Common/StringUtils.h"
#include "Core/HLE/sceUtility.h"
@@ -654,10 +655,11 @@ void SetAxisMapping(int btn, int deviceId, int axisId, int direction, bool repla
void RestoreDefault() {
g_controllerMap.clear();
g_controllerMapGeneration++;
#ifdef OPENXR
SetDefaultKeyMap(DEFAULT_MAPPING_VR_HEADSET, false);
return;
#endif
if (IsVRBuild()) {
SetDefaultKeyMap(DEFAULT_MAPPING_VR_HEADSET, false);
return;
}
#if PPSSPP_PLATFORM(WINDOWS)
SetDefaultKeyMap(DEFAULT_MAPPING_KEYBOARD, true);