summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-09-11 21:30:40 +0800
committerErik Kundiman <erik@megapahit.org>2023-09-11 21:30:40 +0800
commit1b9382cad1bea428bd7a351f41edc153fde77940 (patch)
treec1911b4de8abe1ed890ffcad3da755e8afd39066 /indra/llwindow
parent0797257992ee7f88456d3083ebf214485b75c139 (diff)
Revive HiDPI support & multi threaded OpenGL
See 7dd1149e3649057f0962b85bdc467f4e9299b235. The attributes only needed to be moved from LLWindowMacOS X to LLWindowSDL.
Diffstat (limited to 'indra/llwindow')
-rw-r--r--indra/llwindow/llwindowsdl.cpp4
-rw-r--r--indra/llwindow/llwindowsdl.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index e3af20c090..b982f4e290 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -68,6 +68,8 @@ static bool ATIbug = false;
#if LL_DARWIN
+BOOL gHiDPISupport = TRUE;
+
namespace
{
struct NativeKeyEventData {
@@ -91,6 +93,8 @@ namespace
// LLWindowMacOSX
//
+BOOL LLWindowSDL::sUseMultGL = FALSE;
+
#endif
//
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h
index 86e238282b..ce9ac44076 100644
--- a/indra/llwindow/llwindowsdl.h
+++ b/indra/llwindow/llwindowsdl.h
@@ -152,6 +152,10 @@ public:
static Display* get_SDL_Display(void);
#endif // LL_X11
+#if LL_DARWIN
+ static BOOL sUseMultGL;
+#endif
+
protected:
LLWindowSDL(LLWindowCallbacks* callbacks,
const std::string& title, int x, int y, int width, int height, U32 flags,