Skip to content

Commit 9169251

Browse files
GeenzGeenz
authored
Rename "Vintage Mode" to "HDR and Emissive" in advanced settings. (#3192)
#2590 #3167
1 parent 3001280 commit 9169251

File tree

8 files changed

+30
-31
lines changed

8 files changed

+30
-31
lines changed

‎indra/newview/app_settings/settings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16071,16 +16071,16 @@
1607116071
<key>Value</key>
1607216072
<integer>1</integer>
1607316073
</map>
16074-
<key>RenderVintageMode</key>
16074+
<key>RenderDisableVintageMode</key>
1607516075
<map>
1607616076
<key>Comment</key>
16077-
<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>
16077+
<string>Enables additional rendering pipeline features on newer machines such as HDR and emissive textures on PBR content.</string>
1607816078
<key>Persist</key>
1607916079
<integer>1</integer>
1608016080
<key>Type</key>
1608116081
<string>Boolean</string>
1608216082
<key>Value</key>
16083-
<integer>0</integer>
16083+
<integer>1</integer>
1608416084
</map>
1608516085
</map>
1608616086
</llsd>

‎indra/newview/featuretable.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ RenderTonemapType 1 1
8686
RenderTonemapMix 1 1
8787
RenderEnableEmissiveBuffer 1 1
8888
RenderHDREnabled 1 1
89-
RenderVintageMode 1 1
89+
RenderDisableVintageMode 1 1
9090

9191
//
9292
// Low Graphics Settings
@@ -127,7 +127,7 @@ RenderCASSharpness 1 0
127127
RenderExposure 1 1
128128
RenderTonemapType 1 1
129129
RenderTonemapMix 1 0.7
130-
RenderVintageMode 1 1
130+
RenderDisableVintageMode 1 0
131131

132132
//
133133
// Medium Low Graphics Settings
@@ -168,7 +168,7 @@ RenderCASSharpness 1 0
168168
RenderExposure 1 1
169169
RenderTonemapType 1 1
170170
RenderTonemapMix 1 0.7
171-
RenderVintageMode 1 1
171+
RenderDisableVintageMode 1 0
172172

173173
//
174174
// Medium Graphics Settings (standard)
@@ -378,7 +378,7 @@ RenderShadowDetail 1 0
378378
RenderDeferredSSAO 1 0
379379
RenderMirrors 1 0
380380
RenderEnableEmissiveBuffer 1 0
381-
RenderVintageMode 1 1
381+
RenderDisableVintageMode 1 0
382382

383383
//
384384
// VRAM > 512MB
@@ -401,7 +401,7 @@ RenderDeferredSSAO 0 0
401401
RenderShadowDetail 0 0
402402
RenderReflectionProbeDetail 0 -1
403403
RenderMirrors 0 0
404-
RenderVintageMode 1 1
404+
RenderDisableVintageMode 1 0
405405

406406
list Intel
407407
RenderAnisotropic 1 0
@@ -424,7 +424,7 @@ RenderEnableEmissiveBuffer 1 0
424424
RenderGLMultiThreadedTextures 0 0
425425
RenderGLMultiThreadedMedia 0 0
426426
RenderHDREnabled 1 0
427-
RenderVintageMode 1 1
427+
RenderDisableVintageMode 1 0
428428

429429
list TexUnit16orLess
430430
RenderTerrainPBRDetail 1 -1

‎indra/newview/featuretable_mac.txt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version 67
1+
version 68
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
@@ -83,7 +83,7 @@ RenderCASSharpness 1 1
8383
RenderExposure 1 1
8484
RenderTonemapType 1 1
8585
RenderTonemapMix 1 1
86-
RenderVintageMode 1 1
86+
RenderDisableVintageMode 1 1
8787

8888
//
8989
// Low Graphics Settings
@@ -124,7 +124,7 @@ RenderCASSharpness 1 0
124124
RenderExposure 1 1
125125
RenderTonemapType 1 1
126126
RenderTonemapMix 1 0.7
127-
RenderVintageMode 1 1
127+
RenderDisableVintageMode 1 0
128128

129129
//
130130
// Medium Low Graphics Settings
@@ -165,7 +165,7 @@ RenderCASSharpness 1 0
165165
RenderExposure 1 1
166166
RenderTonemapType 1 1
167167
RenderTonemapMix 1 0.7
168-
RenderVintageMode 1 1
168+
RenderDisableVintageMode 1 0
169169

170170
//
171171
// Medium Graphics Settings (standard)
@@ -374,7 +374,7 @@ list Unknown
374374
RenderShadowDetail 1 0
375375
RenderDeferredSSAO 1 0
376376
RenderMirrors 1 0
377-
RenderVintageMode 1 1
377+
RenderDisableVintageMode 1 0
378378

379379

380380
//
@@ -396,7 +396,7 @@ RenderTerrainDetail 1 0
396396
RenderDeferredSSAO 0 0
397397
RenderShadowDetail 0 0
398398
RenderMirrors 0 0
399-
RenderVintageMode 1 1
399+
RenderDisableVintageMode 1 0
400400

401401
list TexUnit8orLess
402402
RenderDeferredSSAO 0 0
@@ -425,8 +425,7 @@ RenderFSAASamples 0 0
425425
RenderReflectionProbeDetail 0 0
426426
RenderReflectionsEnabled 0 0
427427
RenderMirrors 0 0
428-
RenderVintageMode 1 1
428+
RenderDisableVintageMode 1 0
429429

430430
list VaryingVectors16orLess
431431
RenderTerrainPBRPlanarSampleCount 1 1
432-

‎indra/newview/llfeaturemanager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ void LLFeatureManager::applyBaseMasks()
719719
LLImageGLThread::sEnabledTextures = false;
720720

721721
// Make extra sure that vintage mode also gets enabled.
722-
gSavedSettings.setBOOL("RenderVintageMode", true);
722+
gSavedSettings.setBOOL("RenderDisableVintageMode", false);
723723
}
724724
if (gGLManager.mMaxVaryingVectors <= 16)
725725
{

‎indra/newview/llfloaterpreferencesgraphicsadvanced.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -321,17 +321,17 @@ void LLFloaterPreferenceGraphicsAdvanced::disableUnavailableSettings()
321321
}
322322

323323
// Vintage mode
324-
LLCachedControl<bool> is_vintage(gSavedSettings, "RenderVintageMode");
324+
LLCachedControl<bool> is_not_vintage(gSavedSettings, "RenderDisableVintageMode");
325325
LLSliderCtrl* tonemapMix = getChild<LLSliderCtrl>("TonemapMix");
326326
LLComboBox* tonemapSelect = getChild<LLComboBox>("TonemapType");
327327
LLTextBox* tonemapLabel = getChild<LLTextBox>("TonemapTypeText");
328328
LLSliderCtrl* exposureSlider = getChild<LLSliderCtrl>("RenderExposure");
329329

330-
tonemapSelect->setEnabled(!is_vintage);
331-
tonemapLabel->setEnabled(!is_vintage);
332-
tonemapMix->setEnabled(!is_vintage);
333-
exposureSlider->setEnabled(!is_vintage);
334-
cas_slider->setEnabled(!is_vintage);
330+
tonemapSelect->setEnabled(is_not_vintage);
331+
tonemapLabel->setEnabled(is_not_vintage);
332+
tonemapMix->setEnabled(is_not_vintage);
333+
exposureSlider->setEnabled(is_not_vintage);
334+
cas_slider->setEnabled(is_not_vintage);
335335
}
336336

337337
void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState()

‎indra/newview/llviewercontrol.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,10 @@ static bool handleEnableEmissiveChanged(const LLSD& newvalue)
248248
return handleReleaseGLBufferChanged(newvalue) && handleSetShaderChanged(newvalue);
249249
}
250250

251-
static bool handleEnableClassicMode(const LLSD& newvalue)
251+
static bool handleDisableVintageMode(const LLSD& newvalue)
252252
{
253-
gSavedSettings.setBOOL("RenderEnableEmissiveBuffer", !newvalue.asBoolean());
254-
gSavedSettings.setBOOL("RenderHDREnabled", !newvalue.asBoolean());
253+
gSavedSettings.setBOOL("RenderEnableEmissiveBuffer", newvalue.asBoolean());
254+
gSavedSettings.setBOOL("RenderHDREnabled", newvalue.asBoolean());
255255
return true;
256256
}
257257

@@ -798,7 +798,7 @@ void settings_setup_listeners()
798798
setting_setup_signal_listener(gSavedSettings, "RenderGlowResolutionPow", handleReleaseGLBufferChanged);
799799
setting_setup_signal_listener(gSavedSettings, "RenderGlowHDR", handleReleaseGLBufferChanged);
800800
setting_setup_signal_listener(gSavedSettings, "RenderEnableEmissiveBuffer", handleEnableEmissiveChanged);
801-
setting_setup_signal_listener(gSavedSettings, "RenderVintageMode", handleEnableClassicMode);
801+
setting_setup_signal_listener(gSavedSettings, "RenderDisableVintageMode", handleDisableVintageMode);
802802
setting_setup_signal_listener(gSavedSettings, "RenderHDREnabled", handleEnableHDR);
803803
setting_setup_signal_listener(gSavedSettings, "RenderGlowNoise", handleSetShaderChanged);
804804
setting_setup_signal_listener(gSavedSettings, "RenderGammaFull", handleSetShaderChanged);

‎indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,10 +685,10 @@
685685
</check_box>
686686

687687
<check_box
688-
control_name="RenderVintageMode"
688+
control_name="RenderDisableVintageMode"
689689
height="16"
690690
initial_value="false"
691-
label="Vintage Mode"
691+
label="HDR and Emissive"
692692
layout="topleft"
693693
left="420"
694694
name="VintageMode"

‎indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327

328328
<slider
329329
control_name="RenderExposure"
330-
disabled_control="RenderVintageMode"
330+
enabled_control="RenderDisableVintageMode"
331331
decimal_digits="1"
332332
follows="left|top"
333333
height="16"

0 commit comments

Comments
 (0)