Skip to content
Snippets Groups Projects
Commit d5e558ff authored by David Parks's avatar David Parks
Browse files

SL-19277 Fix for fallback probe sometimes getting occluded and making void...

SL-19277 Fix for fallback probe sometimes getting occluded and making void water dark after teleport.  Never default to having reflections off.
parent e5a2f850
No related branches found
No related tags found
No related merge requests found
version 49 version 50
// The version number above should be incremented IF AND ONLY IF some // The version number above should be incremented IF AND ONLY IF some
// change has been made that is sufficiently important to justify // change has been made that is sufficiently important to justify
// resetting the graphics preferences of all users to the recommended // resetting the graphics preferences of all users to the recommended
...@@ -117,7 +117,7 @@ RenderGlowResolutionPow 1 8 ...@@ -117,7 +117,7 @@ RenderGlowResolutionPow 1 8
RenderMaxPartCount 1 2048 RenderMaxPartCount 1 2048
RenderLocalLights 1 1 RenderLocalLights 1 1
RenderTransparentWater 1 0 RenderTransparentWater 1 0
RenderReflectionsEnabled 1 0 RenderReflectionsEnabled 1 1
RenderReflectionProbeDetail 1 0 RenderReflectionProbeDetail 1 0
RenderTerrainDetail 1 1 RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 1.0 RenderTerrainLODFactor 1 1.0
......
version 44 version 45
// The version number above should be incremented IF AND ONLY IF some // The version number above should be incremented IF AND ONLY IF some
// change has been made that is sufficiently important to justify // change has been made that is sufficiently important to justify
// resetting the graphics preferences of all users to the recommended // resetting the graphics preferences of all users to the recommended
...@@ -123,7 +123,7 @@ RenderUseAdvancedAtmospherics 1 0 ...@@ -123,7 +123,7 @@ RenderUseAdvancedAtmospherics 1 0
RenderShadowDetail 1 0 RenderShadowDetail 1 0
WLSkyDetail 1 48 WLSkyDetail 1 48
RenderFSAASamples 1 0 RenderFSAASamples 1 0
RenderReflectionsEnabled 1 0 RenderReflectionsEnabled 1 1
RenderReflectionProbeDetail 1 0 RenderReflectionProbeDetail 1 0
RenderScreenSpaceReflections 1 0 RenderScreenSpaceReflections 1 0
......
...@@ -425,18 +425,14 @@ bool LLFeatureManager::loadGPUClass() ...@@ -425,18 +425,14 @@ bool LLFeatureManager::loadGPUClass()
} }
if (gbps < 0.f) if (gbps < 0.f)
{ //couldn't bench, use GLVersion { //couldn't bench, default to Low
#if LL_DARWIN #if LL_DARWIN
//GLVersion is misleading on OSX, just default to class 3 if we can't bench //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; LL_WARNS("RenderInit") << "Unable to get an accurate benchmark; defaulting to class 3" << LL_ENDL;
mGPUClass = GPU_CLASS_3; mGPUClass = GPU_CLASS_3;
#else #else
mGPUClass = GPU_CLASS_2;
#endif
}
else if (gbps <= 5.f)
{
mGPUClass = GPU_CLASS_0; mGPUClass = GPU_CLASS_0;
#endif
} }
else if (gbps <= 8.f) else if (gbps <= 8.f)
{ {
......
...@@ -1076,7 +1076,7 @@ void LLReflectionMapManager::doOcclusion() ...@@ -1076,7 +1076,7 @@ void LLReflectionMapManager::doOcclusion()
for (auto& probe : mProbes) for (auto& probe : mProbes)
{ {
if (probe != nullptr) if (probe != nullptr && probe != mDefaultProbe)
{ {
probe->doOcclusion(eye); probe->doOcclusion(eye);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment