From 7cc7064dca039feff5788bf288c8c66028ae6493 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 12 Aug 2020 01:41:45 -0400
Subject: [PATCH] Ensure XInitThreads is called before SDL initialization so
threaded nvidia optimization works
---
indra/llwindow/llwindowsdl.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 3779df6638c..d97f3e9f2a0 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -239,9 +239,12 @@ LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks,
mGamma(1.0f)
{
SDL_SetMainReady();
-
SDL_LogSetOutputFunction(&sdlLogOutputFunc, nullptr);
+#if LL_X11
+ XInitThreads();
+#endif
+
if (SDL_InitSubSystem(SDL_INIT_EVENTS|SDL_INIT_VIDEO|SDL_INIT_GAMECONTROLLER|SDL_INIT_JOYSTICK) != 0)
{
LL_WARNS() << "Failed to initialize SDL due to error: " << SDL_GetError() << LL_ENDL;
--
GitLab