livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-19277 Fix for fallback probe sometimes getting occluded and making void water dark after teleport. Never default to having reflections off.

master
Dave Parks 2023-02-28 08:49:15 -06:00
parent e5a2f85005
commit d5e558fffc
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/featuretable.txt
View File

@ -1,4 +1,4 @@
version 49
version 50
// 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
@ -117,7 +117,7 @@ RenderGlowResolutionPow 1 8
RenderMaxPartCount 1 2048
RenderLocalLights 1 1
RenderTransparentWater 1 0
RenderReflectionsEnabled 1 0
RenderReflectionsEnabled 1 1
RenderReflectionProbeDetail 1 0
RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 1.0

4
indra/newview/featuretable_mac.txt
View File

@ -1,4 +1,4 @@
version 44
version 45
// 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
@ -123,7 +123,7 @@ RenderUseAdvancedAtmospherics 1 0
RenderShadowDetail 1 0
WLSkyDetail 1 48
RenderFSAASamples 1 0
RenderReflectionsEnabled 1 0
RenderReflectionsEnabled 1 1
RenderReflectionProbeDetail 1 0
RenderScreenSpaceReflections 1 0

8
indra/newview/llfeaturemanager.cpp
View File

@ -425,18 +425,14 @@ bool LLFeatureManager::loadGPUClass()
}
if (gbps < 0.f)
{ //couldn't bench, use GLVersion
{ //couldn't bench, default to Low
#if LL_DARWIN
//GLVersion is misleading on OSX, just default to class 3 if we can't bench
LL_WARNS("RenderInit") << "Unable to get an accurate benchmark; defaulting to class 3" << LL_ENDL;
mGPUClass = GPU_CLASS_3;
#else
mGPUClass = GPU_CLASS_2;
#endif
}
else if (gbps <= 5.f)
{
mGPUClass = GPU_CLASS_0;
#endif
}
else if (gbps <= 8.f)
{

2
indra/newview/llreflectionmapmanager.cpp
View File

@ -1076,7 +1076,7 @@ void LLReflectionMapManager::doOcclusion()
for (auto& probe : mProbes)
{
if (probe != nullptr)
if (probe != nullptr && probe != mDefaultProbe)
{
probe->doOcclusion(eye);
}