diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-10 15:14:20 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-10 15:14:20 +0800 |
| commit | d5d514d07f334953c674ef64d4474b2decef24b3 (patch) | |
| tree | edfec588bc211674f53cd7c759eedb77dcf1e4ec | |
| parent | 8c21d1177314c61c7e555d56ae4994f51003ee64 (diff) | |
| parent | 13c0708cc70078e5118dd88de57d4ffd52f85024 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
| -rw-r--r-- | indra/llcommon/llprocessor.cpp | 3 | ||||
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 13 | ||||
| -rw-r--r-- | indra/newview/featuretable_mac.txt | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index e119e5d0b7..1696a165a2 100644 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -699,7 +699,8 @@ private: memset(cpu_vendor, 0, len); sysctlbyname("machdep.cpu.vendor", (void*)cpu_vendor, &len, NULL, 0); cpu_vendor[0x1f] = 0; - setInfo(eVendor, cpu_vendor); + // M series CPUs don't provide this field so if empty, just fall back to Apple. + setInfo(eVendor, (cpu_vendor[0] != '\0') ? cpu_vendor : "Apple"); setInfo(eStepping, getSysctlInt("machdep.cpu.stepping")); setInfo(eModel, getSysctlInt("machdep.cpu.model")); diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 1d39786c2a..09a2138b5e 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -2276,15 +2276,15 @@ void LLImageGL::analyzeAlpha(const void* data_in, U32 w, U32 h) // this will mid-skew the data (and thus increase the chances of not // being used as a mask) from high-frequency alpha maps which // suffer the worst from aliasing when used as alpha masks. - if (w >= 4 && h >= 4) + if (w >= 2 && h >= 2) { - llassert(w%4 == 0); - llassert(h%4 == 0); + llassert(w % 2 == 0); + llassert(h % 2 == 0); const GLubyte* rowstart = ((const GLubyte*) data_in) + mAlphaOffset; - for (U32 y = 0; y < h; y+=4) + for (U32 y = 0; y < h; y += 2) { const GLubyte* current = rowstart; - for (U32 x = 0; x < w; x+=4) + for (U32 x = 0; x < w; x += 2) { const U32 s1 = current[0]; alphatotal += s1; @@ -2307,8 +2307,7 @@ void LLImageGL::analyzeAlpha(const void* data_in, U32 w, U32 h) sample[asum/(16*4)] += 4; } - - rowstart += 4 * w * mAlphaStride; + rowstart += 2 * w * mAlphaStride; } length *= 2; // we sampled everything twice, essentially } diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index b82f8c937c..c5c2bb3e2d 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -1,4 +1,4 @@ -version 62 +version 63 // The version number above should be incremented IF AND ONLY IF some // change has been made that is sufficiently important to justify // resetting the graphics preferences of all users to the recommended @@ -68,8 +68,8 @@ RenderFSAASamples 1 3 RenderMaxTextureIndex 1 16 RenderGLContextCoreProfile 1 1 RenderGLMultiThreadedTextures 1 0 -RenderGLMultiThreadedMedia 1 1 -RenderAppleUseMultGL 1 1 +RenderGLMultiThreadedMedia 1 0 +RenderAppleUseMultGL 1 0 RenderReflectionsEnabled 1 1 RenderReflectionProbeDetail 1 2 RenderScreenSpaceReflections 1 1 @@ -409,8 +409,8 @@ RenderFSAASamples 1 0 // AppleGPU and NonAppleGPU can be thought of as Apple silicon vs Intel Mac list AppleGPU -RenderGLMultiThreadedMedia 1 1 -RenderAppleUseMultGL 1 1 +RenderGLMultiThreadedMedia 1 0 +RenderAppleUseMultGL 1 0 list NonAppleGPU RenderGLMultiThreadedMedia 1 0 |