summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-06-26 22:09:30 +0800
committerErik Kundiman <erik@megapahit.org>2025-06-26 22:11:12 +0800
commit89a6a94e4026e6f87f54dfe5214173b07f520fc5 (patch)
treed24db79025123f67821b9fb5ea6773b033f8ab21 /indra
parentbd4f7fd03d428e1592d96b75522716a72ab673b1 (diff)
Disable direct input init on Win ARM64 for now
This would be for joysticks & spacemouses, which aren't that urgent. This is disabled as it seems to be causing a segmentation fault on Windows ARM64.
Diffstat (limited to 'indra')
-rw-r--r--indra/llwindow/llwindowwin32.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 4fca74497f..64f20e65ca 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -576,6 +576,7 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
// Make an instance of our window then define the window class
mhInstance = GetModuleHandle(NULL);
+#if !_M_ARM64
// Init Direct Input - needed for joystick / Spacemouse
LPDIRECTINPUT8 di8_interface;
@@ -590,6 +591,7 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
{
gDirectInput8 = di8_interface;
}
+#endif
mSwapMethod = SWAP_METHOD_UNDEFINED;