diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-12-15 12:34:37 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-12-15 12:34:37 +0800 |
commit | 3316ffb3b571b8730d26d6e8b2ee00fc9cbdf7c0 (patch) | |
tree | 200cd8497a4fdd782ac4dbfd2ad5fb1632e03275 /indra/newview/llappviewer.cpp | |
parent | d4e433b37af94ee11880deeede74a87a728f4775 (diff) | |
parent | 5b77436cf0ad749d36e8f0c60077eeb24698d644 (diff) |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 4686f81b88..7c040a3ca1 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2214,7 +2214,12 @@ bool LLAppViewer::initThreads() // get the number of concurrent threads that can run S32 cores = std::thread::hardware_concurrency(); - +#if LL_DARWIN + if (!gGLManager.mIsApple) + { + cores /= 2; + } +#endif U32 max_cores = gSavedSettings.getU32("EmulateCoreCount"); if (max_cores != 0) { |