From d357aa29a3cbeb12745cfb1428098e228cb5bf02 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 5 May 2025 15:52:28 -0700
Subject: [PATCH] Fixed initializing the OpenVR driver
---
src/video/openvr/SDL_openvrvideo.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/video/openvr/SDL_openvrvideo.c b/src/video/openvr/SDL_openvrvideo.c
index a89467cc1bb60..54e44ba43be83 100644
--- a/src/video/openvr/SDL_openvrvideo.c
+++ b/src/video/openvr/SDL_openvrvideo.c
@@ -22,7 +22,9 @@
#ifdef SDL_VIDEO_DRIVER_OPENVR
+#if 0
#define DEBUG_OPENVR
+#endif
#include "../../events/SDL_mouse_c.h"
#include "../../events/SDL_keyboard_c.h"
@@ -445,7 +447,7 @@ static void OPENVR_VirtualControllerUpdate(void *userdata)
static bool OPENVR_SetupJoystickBasedOnLoadedActionManifest(SDL_VideoData * videodata)
{
SDL_VirtualJoystickDesc desc;
- int virtual_index;
+ SDL_JoystickID virtual_id;
EVRInputError e = 0;
@@ -537,9 +539,9 @@ static bool OPENVR_SetupJoystickBasedOnLoadedActionManifest(SDL_VideoData * vide
desc.RumbleTriggers = OPENVR_VirtualControllerRumbleTriggers;
desc.Update = OPENVR_VirtualControllerUpdate;
desc.userdata = videodata;
- virtual_index = SDL_AttachVirtualJoystick(&desc);
+ virtual_id = SDL_AttachVirtualJoystick(&desc);
- if (virtual_index < 0) {
+ if (!virtual_id) {
return SDL_SetError("OPENVR: Couldn't open virtual joystick device: %s", SDL_GetError());
} else {
videodata->virtual_joystick = SDL_OpenJoystick(virtual_index);
@@ -552,7 +554,7 @@ static bool OPENVR_SetupJoystickBasedOnLoadedActionManifest(SDL_VideoData * vide
SDL_Log("Loaded virtual joystick with %d buttons and %d axes", videodata->input_action_handles_buttons_count, videodata->input_action_handles_axes_count);
#endif
- return false;
+ return true;
}
static bool OPENVR_InitializeOverlay(SDL_VideoDevice *_this,SDL_Window *window)