Skip to content

Commit 13c0708

Browse files
authored
Attempt at fix for #2745 mac crash when app is in background (#3063)
once again disable RenderAppleUseMultGL and RenderGLMultiThreadedMedia also added a tiny fix for missing processor vendor in crash reports
1 parent ef11af2 commit 13c0708

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

indra/llcommon/llprocessor.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,8 @@ class LLProcessorInfoDarwinImpl : public LLProcessorInfoImpl
692692
memset(cpu_vendor, 0, len);
693693
sysctlbyname("machdep.cpu.vendor", (void*)cpu_vendor, &len, NULL, 0);
694694
cpu_vendor[0x1f] = 0;
695-
setInfo(eVendor, cpu_vendor);
695+
// M series CPUs don't provide this field so if empty, just fall back to Apple.
696+
setInfo(eVendor, (cpu_vendor[0] != '\0') ? cpu_vendor : "Apple");
696697

697698
setInfo(eStepping, getSysctlInt("machdep.cpu.stepping"));
698699
setInfo(eModel, getSysctlInt("machdep.cpu.model"));

indra/newview/featuretable_mac.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version 62
1+
version 63
22
// The version number above should be incremented IF AND ONLY IF some
33
// change has been made that is sufficiently important to justify
44
// resetting the graphics preferences of all users to the recommended
@@ -68,8 +68,8 @@ RenderFSAASamples 1 3
6868
RenderMaxTextureIndex 1 16
6969
RenderGLContextCoreProfile 1 1
7070
RenderGLMultiThreadedTextures 1 0
71-
RenderGLMultiThreadedMedia 1 1
72-
RenderAppleUseMultGL 1 1
71+
RenderGLMultiThreadedMedia 1 0
72+
RenderAppleUseMultGL 1 0
7373
RenderReflectionsEnabled 1 1
7474
RenderReflectionProbeDetail 1 2
7575
RenderScreenSpaceReflections 1 1
@@ -408,8 +408,8 @@ RenderFSAASamples 1 0
408408

409409
// AppleGPU and NonAppleGPU can be thought of as Apple silicon vs Intel Mac
410410
list AppleGPU
411-
RenderGLMultiThreadedMedia 1 1
412-
RenderAppleUseMultGL 1 1
411+
RenderGLMultiThreadedMedia 1 0
412+
RenderAppleUseMultGL 1 0
413413

414414
list NonAppleGPU
415415
RenderGLMultiThreadedMedia 1 0

0 commit comments

Comments
 (0)