diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-09-11 21:30:40 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-09-11 21:30:40 +0800 |
| commit | 1b9382cad1bea428bd7a351f41edc153fde77940 (patch) | |
| tree | c1911b4de8abe1ed890ffcad3da755e8afd39066 /indra/newview | |
| parent | 0797257992ee7f88456d3083ebf214485b75c139 (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/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 777fc4c3a7..5d23f5b784 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -139,7 +139,7 @@ //#endif // LL_LINUX #if LL_DARWIN -#include "llwindowmacosx.h" +#include "llwindowsdl.h" #endif // Third party library includes @@ -288,7 +288,7 @@ extern BOOL gRandomizeFramerate; extern BOOL gPeriodicSlowFrame; extern BOOL gDebugGL; -#if LL_DARWIN && !LL_SDL +#if LL_DARWIN extern BOOL gHiDPISupport; #endif @@ -568,8 +568,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 } @@ -3315,7 +3315,7 @@ LLSD LLAppViewer::getViewerInfo() const info["GPU_SHADERS"] = gSavedSettings.getBOOL("RenderDeferred") ? "Enabled" : "Disabled"; info["TEXTURE_MEMORY"] = gSavedSettings.getS32("TextureMemory"); -#if LL_DARWIN && !LL_SDL +#if LL_DARWIN info["HIDPI"] = gHiDPISupport; #endif |