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 | |
| parent | 3d75e02acac546c16cb7cb393e7964b4bcfd1daf (diff) | |
| parent | 1b9382cad1bea428bd7a351f41edc153fde77940 (diff) | |
Merge branch 'main' into DRTVWR-559
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 4 | ||||
| -rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 4 | ||||
| -rw-r--r-- | indra/llwindow/llwindowsdl.h | 4 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 10 |
4 files changed, 15 insertions, 7 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 2d19e3df90..e0b3f6ef56 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -36,7 +36,7 @@ #ifndef LL_USESYSTEMLIBS extern LLControlGroup gSavedSettings; #endif -#if LL_DARWIN && !LL_SDL +#if LL_DARWIN extern BOOL gHiDPISupport; #endif @@ -370,7 +370,7 @@ void LLPluginClassMedia::setSizeInternal(void) mRequestedMediaHeight = nextPowerOf2(mRequestedMediaHeight); } -#if LL_DARWIN && !LL_SDL +#if LL_DARWIN if (!gHiDPISupport) #endif { 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, diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9183fb75b3..757280f17e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -140,7 +140,7 @@ //#endif // LL_LINUX #if LL_DARWIN -#include "llwindowmacosx.h" +#include "llwindowsdl.h" #endif // Third party library includes @@ -289,7 +289,7 @@ extern BOOL gRandomizeFramerate; extern BOOL gPeriodicSlowFrame; extern BOOL gDebugGL; -#if LL_DARWIN && !LL_SDL +#if LL_DARWIN extern BOOL gHiDPISupport; #endif @@ -569,8 +569,8 @@ static void settings_to_globals() gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates"); LLWorldMapView::setScaleSetting(gSavedSettings.getF32("MapScale")); -#if LL_DARWIN && !LL_SDL - LLWindowMacOSX::sUseMultGL = gSavedSettings.getBOOL("RenderAppleUseMultGL"); +#if LL_DARWIN + LLWindowSDL::sUseMultGL = gSavedSettings.getBOOL("RenderAppleUseMultGL"); gHiDPISupport = gSavedSettings.getBOOL("RenderHiDPI"); #endif } @@ -3332,7 +3332,7 @@ LLSD LLAppViewer::getViewerInfo() const info["GPU_SHADERS"] = gSavedSettings.getBOOL("RenderDeferred") ? "Enabled" : "Disabled"; info["TEXTURE_MEMORY"] = gGLManager.mVRAM; -#if LL_DARWIN && !LL_SDL +#if LL_DARWIN info["HIDPI"] = gHiDPISupport; #endif |