diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-08-21 17:35:54 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-08-21 17:35:54 +0800 |
| commit | 7dd1149e3649057f0962b85bdc467f4e9299b235 (patch) | |
| tree | c2c59e346126467f9d6f4683f3a97295bbf4bdc3 /indra/newview | |
| parent | b1cfd19724fd1791f5b383e2d9dac71d35ba2167 (diff) | |
Darwin not (directly) relying on Carbon & Obj-C
HiDPI support & multi threaded OpenGL haven't been used since we
switched to SDL2 on Darwin, and so far there hasn't been any sign
that things aren't working any more significantly.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 23e6b16103..a63785990f 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -288,7 +288,7 @@ extern BOOL gRandomizeFramerate; extern BOOL gPeriodicSlowFrame; extern BOOL gDebugGL; -#if LL_DARWIN +#if LL_DARWIN && !LL_SDL extern BOOL gHiDPISupport; #endif @@ -568,7 +568,7 @@ static void settings_to_globals() gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates"); LLWorldMapView::setScaleSetting(gSavedSettings.getF32("MapScale")); -#if LL_DARWIN +#if LL_DARWIN && !LL_SDL LLWindowMacOSX::sUseMultGL = gSavedSettings.getBOOL("RenderAppleUseMultGL"); gHiDPISupport = gSavedSettings.getBOOL("RenderHiDPI"); #endif @@ -3310,7 +3310,7 @@ LLSD LLAppViewer::getViewerInfo() const info["GPU_SHADERS"] = gSavedSettings.getBOOL("RenderDeferred") ? "Enabled" : "Disabled"; info["TEXTURE_MEMORY"] = gSavedSettings.getS32("TextureMemory"); -#if LL_DARWIN +#if LL_DARWIN && !LL_SDL info["HIDPI"] = gHiDPISupport; #endif |