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

Rename "Vintage Mode" to "HDR and Emissive" in advanced settings. (#3192) 

#2590
#3167
master
Jonathan "Geenz" Goodman 2024-12-03 18:20:44 -05:00 committed by GitHub
parent 3001280141
commit 91692511a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/app_settings/settings.xml
View File

@ -16071,16 +16071,16 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>RenderVintageMode</key>
<key>RenderDisableVintageMode</key>
<map>
<key>Comment</key>
<string>Disable different rendering pipeline features to improve performance on older machines that makes the world look closer to how it used to prior to V7.</string>
<string>Enables additional rendering pipeline features on newer machines such as HDR and emissive textures on PBR content.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<integer>1</integer>
</map>
</map>
</llsd>

12
indra/newview/featuretable.txt
View File

@ -86,7 +86,7 @@ RenderTonemapType 1 1
RenderTonemapMix 1 1
RenderEnableEmissiveBuffer 1 1
RenderHDREnabled 1 1
RenderVintageMode 1 1
RenderDisableVintageMode 1 1
//
// Low Graphics Settings
@ -127,7 +127,7 @@ RenderCASSharpness 1 0
RenderExposure 1 1
RenderTonemapType 1 1
RenderTonemapMix 1 0.7
RenderVintageMode 1 1
RenderDisableVintageMode 1 0
//
// Medium Low Graphics Settings
@ -168,7 +168,7 @@ RenderCASSharpness 1 0
RenderExposure 1 1
RenderTonemapType 1 1
RenderTonemapMix 1 0.7
RenderVintageMode 1 1
RenderDisableVintageMode 1 0
//
// Medium Graphics Settings (standard)
@ -378,7 +378,7 @@ RenderShadowDetail 1 0
RenderDeferredSSAO 1 0
RenderMirrors 1 0
RenderEnableEmissiveBuffer 1 0
RenderVintageMode 1 1
RenderDisableVintageMode 1 0
//
// VRAM > 512MB
@ -401,7 +401,7 @@ RenderDeferredSSAO 0 0
RenderShadowDetail 0 0
RenderReflectionProbeDetail 0 -1
RenderMirrors 0 0
RenderVintageMode 1 1
RenderDisableVintageMode 1 0
list Intel
RenderAnisotropic 1 0
@ -424,7 +424,7 @@ RenderEnableEmissiveBuffer 1 0
RenderGLMultiThreadedTextures 0 0
RenderGLMultiThreadedMedia 0 0
RenderHDREnabled 1 0
RenderVintageMode 1 1
RenderDisableVintageMode 1 0
list TexUnit16orLess
RenderTerrainPBRDetail 1 -1

15
indra/newview/featuretable_mac.txt
View File

@ -1,4 +1,4 @@
version 67
version 68
// 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
@ -83,7 +83,7 @@ RenderCASSharpness 1 1
RenderExposure 1 1
RenderTonemapType 1 1
RenderTonemapMix 1 1
RenderVintageMode 1 1
RenderDisableVintageMode 1 1
//
// Low Graphics Settings
@ -124,7 +124,7 @@ RenderCASSharpness 1 0
RenderExposure 1 1
RenderTonemapType 1 1
RenderTonemapMix 1 0.7
RenderVintageMode 1 1
RenderDisableVintageMode 1 0
//
// Medium Low Graphics Settings
@ -165,7 +165,7 @@ RenderCASSharpness 1 0
RenderExposure 1 1
RenderTonemapType 1 1
RenderTonemapMix 1 0.7
RenderVintageMode 1 1
RenderDisableVintageMode 1 0
//
// Medium Graphics Settings (standard)
@ -374,7 +374,7 @@ list Unknown
RenderShadowDetail 1 0
RenderDeferredSSAO 1 0
RenderMirrors 1 0
RenderVintageMode 1 1
RenderDisableVintageMode 1 0
//
@ -396,7 +396,7 @@ RenderTerrainDetail 1 0
RenderDeferredSSAO 0 0
RenderShadowDetail 0 0
RenderMirrors 0 0
RenderVintageMode 1 1
RenderDisableVintageMode 1 0
list TexUnit8orLess
RenderDeferredSSAO 0 0
@ -425,8 +425,7 @@ RenderFSAASamples 0 0
RenderReflectionProbeDetail 0 0
RenderReflectionsEnabled 0 0
RenderMirrors 0 0
RenderVintageMode 1 1
RenderDisableVintageMode 1 0
list VaryingVectors16orLess
RenderTerrainPBRPlanarSampleCount 1 1

2
indra/newview/llfeaturemanager.cpp
View File

@ -719,7 +719,7 @@ void LLFeatureManager::applyBaseMasks()
LLImageGLThread::sEnabledTextures = false;
// Make extra sure that vintage mode also gets enabled.
gSavedSettings.setBOOL("RenderVintageMode", true);
gSavedSettings.setBOOL("RenderDisableVintageMode", false);
}
if (gGLManager.mMaxVaryingVectors <= 16)
{

12
indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
View File

@ -321,17 +321,17 @@ void LLFloaterPreferenceGraphicsAdvanced::disableUnavailableSettings()
}
// Vintage mode
LLCachedControl<bool> is_vintage(gSavedSettings, "RenderVintageMode");
LLCachedControl<bool> is_not_vintage(gSavedSettings, "RenderDisableVintageMode");
LLSliderCtrl* tonemapMix = getChild<LLSliderCtrl>("TonemapMix");
LLComboBox* tonemapSelect = getChild<LLComboBox>("TonemapType");
LLTextBox* tonemapLabel = getChild<LLTextBox>("TonemapTypeText");
LLSliderCtrl* exposureSlider = getChild<LLSliderCtrl>("RenderExposure");
tonemapSelect->setEnabled(!is_vintage);
tonemapLabel->setEnabled(!is_vintage);
tonemapMix->setEnabled(!is_vintage);
exposureSlider->setEnabled(!is_vintage);
cas_slider->setEnabled(!is_vintage);
tonemapSelect->setEnabled(is_not_vintage);
tonemapLabel->setEnabled(is_not_vintage);
tonemapMix->setEnabled(is_not_vintage);
exposureSlider->setEnabled(is_not_vintage);
cas_slider->setEnabled(is_not_vintage);
}
void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState()

8
indra/newview/llviewercontrol.cpp
View File

@ -248,10 +248,10 @@ static bool handleEnableEmissiveChanged(const LLSD& newvalue)
return handleReleaseGLBufferChanged(newvalue) && handleSetShaderChanged(newvalue);
}
static bool handleEnableClassicMode(const LLSD& newvalue)
static bool handleDisableVintageMode(const LLSD& newvalue)
{
gSavedSettings.setBOOL("RenderEnableEmissiveBuffer", !newvalue.asBoolean());
gSavedSettings.setBOOL("RenderHDREnabled", !newvalue.asBoolean());
gSavedSettings.setBOOL("RenderEnableEmissiveBuffer", newvalue.asBoolean());
gSavedSettings.setBOOL("RenderHDREnabled", newvalue.asBoolean());
return true;
}
@ -798,7 +798,7 @@ void settings_setup_listeners()
setting_setup_signal_listener(gSavedSettings, "RenderGlowResolutionPow", handleReleaseGLBufferChanged);
setting_setup_signal_listener(gSavedSettings, "RenderGlowHDR", handleReleaseGLBufferChanged);
setting_setup_signal_listener(gSavedSettings, "RenderEnableEmissiveBuffer", handleEnableEmissiveChanged);
setting_setup_signal_listener(gSavedSettings, "RenderVintageMode", handleEnableClassicMode);
setting_setup_signal_listener(gSavedSettings, "RenderDisableVintageMode", handleDisableVintageMode);
setting_setup_signal_listener(gSavedSettings, "RenderHDREnabled", handleEnableHDR);
setting_setup_signal_listener(gSavedSettings, "RenderGlowNoise", handleSetShaderChanged);
setting_setup_signal_listener(gSavedSettings, "RenderGammaFull", handleSetShaderChanged);

4
indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
View File

@ -685,10 +685,10 @@
</check_box>
<check_box
control_name="RenderVintageMode"
control_name="RenderDisableVintageMode"
height="16"
initial_value="false"
label="Vintage Mode"
label="HDR and Emissive"
layout="topleft"
left="420"
name="VintageMode"

2
indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
View File

@ -327,7 +327,7 @@
<slider
control_name="RenderExposure"
disabled_control="RenderVintageMode"
enabled_control="RenderDisableVintageMode"
decimal_digits="1"
follows="left|top"
height="16"