diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-09-11 22:07:22 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-09-11 22:07:22 +0800 |
| commit | 33cea024db8b63b19e445126f8226e7af7ba61f7 (patch) | |
| tree | e4a0b650de757469eb900233130248e91e99fc67 /indra/llwindow | |
| parent | 3d75e02acac546c16cb7cb393e7964b4bcfd1daf (diff) | |
| parent | 1b9382cad1bea428bd7a351f41edc153fde77940 (diff) | |
Merge branch 'main' into DRTVWR-559
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 4 | ||||
| -rw-r--r-- | indra/llwindow/llwindowsdl.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 00a467b5be..10e8b03f4c 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 93edef991d..17bdc16bf6 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -154,6 +154,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, |