From c61e866da560bbfe2ea9f3ecfb31b9c16239ef48 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 20 Apr 2023 20:00:22 -0400
Subject: [PATCH] Bonk the feature tables
---
indra/newview/alrenderutils.cpp | 7 +------
indra/newview/featuretable.txt | 2 +-
indra/newview/featuretable_linux.txt | 7 ++++---
indra/newview/featuretable_mac.txt | 2 +-
indra/newview/llpresetsmanager.cpp | 10 ++++++----
5 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/indra/newview/alrenderutils.cpp b/indra/newview/alrenderutils.cpp
index b6fbb0cc110..c2d508f05fd 100644
--- a/indra/newview/alrenderutils.cpp
+++ b/indra/newview/alrenderutils.cpp
@@ -314,7 +314,7 @@ bool ALRenderUtil::setupTonemap()
mTonemapType = gSavedSettings.getU32("RenderToneMapType");
if (mTonemapType >= TONEMAP_COUNT)
{
- mTonemapType = ALTonemap::TONEMAP_NONE;
+ mTonemapType = ALTonemap::TONEMAP_ACES_HILL;
}
mTonemapExposure = llclamp(gSavedSettings.getF32("RenderExposure"), 0.5f, 4.f);
@@ -326,11 +326,6 @@ bool ALRenderUtil::setupTonemap()
mToneUnchartedParamB = LLVector3(gSavedSettings.getF32("AlchemyToneMapFilmicShoulderLen"), gSavedSettings.getF32("AlchemyToneMapFilmicShoulderAngle"), gSavedSettings.getF32("AlchemyToneMapFilmicGamma"));
mToneUnchartedParamC = LLVector3(gSavedSettings.getF32("AlchemyToneMapFilmicWhitePoint"), 2.0, 0.0);
}
- else
- {
- mTonemapType = ALTonemap::TONEMAP_NONE;
- mTonemapExposure = 1.f;
- }
return true;
}
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index bb6dde37fb3..253d380b3c2 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 55
+version 56
// 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
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index ad740b03597..3bff96f3486 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -1,4 +1,4 @@
-version 52
+version 53
// 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
@@ -69,7 +69,8 @@ RenderUseStreamVBO 1 1
RenderFSAASamples 1 16
RenderMaxTextureIndex 1 16
RenderGLContextCoreProfile 1 1
-RenderGLMultiThreaded 1 0
+RenderGLMultiThreadedTextures 1 0
+RenderGLMultiThreadedMedia 1 0
RenderReflectionProbeResolution 1 128
RenderScreenSpaceReflections 1 1
RenderToneMapType 1 1
@@ -298,7 +299,7 @@ RenderFSAASamples 1 0
RenderGLContextCoreProfile 1 1
list AMD
-RenderGLMultiThreaded 1 1
+RenderGLMultiThreadedTextures 1 0
list GL3
RenderFSAASamples 0 0
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 16cc68ae52b..278f3c9fe7f 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 50
+version 51
// 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
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index 9c953436809..80bf5796b83 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -292,8 +292,6 @@ void LLPresetsManager::getGraphicsControlNames(std::vector<std::string>& names)
{
const std::vector<std::string> camera_controls = {
// From panel_preferences_graphics.xml
- "AlchemyRenderCAS",
- "AlchemyRenderCASSharpness",
"AlwaysRenderFriends",
"RenderAnisotropicLevel",
"RenderAvatarLODFactor",
@@ -301,13 +299,11 @@ void LLPresetsManager::getGraphicsControlNames(std::vector<std::string>& names)
"RenderAvatarMaxNonImpostors",
"RenderAvatarPhysicsLODFactor",
"RenderColorGradeLUT",
- "RenderCompressTextures",
"RenderDeferredSSAO",
"RenderDepthOfField",
"RenderFSAASamples",
"RenderFarClip",
"RenderFlexTimeFactor",
- "RenderGamma",
"RenderGlowResolutionPow",
"RenderLocalLights",
"RenderMaxPartCount",
@@ -320,6 +316,12 @@ void LLPresetsManager::getGraphicsControlNames(std::vector<std::string>& names)
"RenderTreeLODFactor",
"RenderVolumeLODFactor",
"WLSkyDetail",
+ "RenderScreenSpaceReflections",
+ "RenderReflectionProbeDetail",
+ "RenderReflectionProbeLevel"
+ "RenderSharpenMethod",
+ "RenderSharpenDLSParams",
+ "RenderSharpenCASParams",
};
names = camera_controls;
}
--
GitLab