Make HDR one fixed look with true blacks, and keep only its on switch and the three whites as settings.

HDR on is the game's scene through the observer-response mapper, anchored to the game's own mid grey and tone slope, with half of the hue bend of the game's clamp: the defaults the menu had. The tone mapper choice, the mid grey, the tone slope and its match, the hue clip, exposure, highlights, shadows, contrast, saturation, highlight saturation, blowout, flare, hue, grade and gamma are gone from the menu, the settings table and the example ini; a file that still sets them works as before, the keys read by nothing and logging nothing. The menu's HDR row is Off and On, with the peak, game and HUD whites under it. The game's own HDR is still there for a file that sets hdr = native, and the row lists it only then. The luminance mapper and its grading code, which no setting reaches any more, are removed from the tonemap library, and the support buffer carries one vec4 for it.

The dark tones of a dark scene sat far above black: the present showed the game's sRGB-encoded picture as that encode decodes, linear near black, while the game is graded for a display of gamma about 2.2, and since the observer-response mapper became the default the 2.2 correction ran with the luminance mapper only. A scene value of 0.003 came out at 0.29 nits at a white of 350 nits, where a 2.2 display shows the game at 0.015. The present now always shows the picture as a 2.2 display would, and the tonemap aims its peak lower by that correction's inverse, so the brightest light still reaches the display's peak; the same value comes out at 0.017 nits.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
chrg6
2026-11-11 14:13:34 -05:00
parent 358ad54105
commit 309e412f1f
14 changed files with 131 additions and 620 deletions

View File

@@ -116,44 +116,6 @@ static const char *const text_en[UI_TEXT_COUNT] = {
[UI_MENU_HDR_GAME_DESC] = "Brightness of white in the game, in nits.",
[UI_MENU_HDR_UI] = "HUD and menu brightness",
[UI_MENU_HDR_UI_DESC] = "Brightness of the HUD and this menu, in nits.",
[UI_MENU_HDR_HUE] = "Hue correction",
[UI_MENU_HDR_HUE_DESC] = "How much bright colours keep the hue they have before the tone mapper; 0 lets them shift "
"as the curve takes them.",
[UI_MENU_HDR_GAMMA] = "Gamma correction",
[UI_MENU_HDR_GAMMA_DESC] = "Shows the picture as a 2.2 or BT.1886 (2.4) display would, as the game was made to be "
"seen; Off keeps the sRGB curve, with lighter shadows.",
[UI_MENU_HDR_TONEMAP] = "Tone mapper",
[UI_MENU_HDR_TONEMAP_DESC] = "Vanilla: the game's own curve at SDR brightness. PsychoV35: the scene through a model "
"of the eye's response, matched to the game's mid grey and tone, up to your display's "
"peak. RenoDRT: the game's SDR look carried up to the peak by brightness.",
[UI_MENU_HDR_EXPOSURE] = "Exposure",
[UI_MENU_HDR_EXPOSURE_DESC] = "Brightness of the whole picture before the tone mapper; 100 % leaves it unchanged.",
[UI_MENU_HDR_HIGHLIGHTS] = "Highlights",
[UI_MENU_HDR_HIGHLIGHTS_DESC] = "Brightness of the bright parts; 50 leaves them unchanged.",
[UI_MENU_HDR_SHADOWS] = "Shadows",
[UI_MENU_HDR_SHADOWS_DESC] = "Brightness of the dark parts; 50 leaves them unchanged.",
[UI_MENU_HDR_CONTRAST] = "Contrast",
[UI_MENU_HDR_CONTRAST_DESC] = "Contrast around mid grey; 50 leaves it unchanged.",
[UI_MENU_HDR_SATURATION] = "Saturation",
[UI_MENU_HDR_SATURATION_DESC] = "Strength of all colours; 50 leaves it unchanged.",
[UI_MENU_HDR_HIGHLIGHT_SAT] = "Highlight saturation",
[UI_MENU_HDR_HIGHLIGHT_SAT_DESC] = "Strength of the colours of the brightest parts; 50 leaves it unchanged.",
[UI_MENU_HDR_BLOWOUT] = "Blowout",
[UI_MENU_HDR_BLOWOUT_DESC] = "Turns the brightest parts towards white; 0 keeps their colour.",
[UI_MENU_HDR_FLARE] = "Flare",
[UI_MENU_HDR_FLARE_DESC] = "Lifts the darkest parts as a little stray light would; 0 keeps black black.",
[UI_MENU_HDR_GRADE] = "Colour grading",
[UI_MENU_HDR_GRADE_DESC] = "How much of the game's own colour grading the HDR picture keeps; 0 is the scene without it.",
[UI_MENU_HDR_MIDGRAY] = "Mid grey",
[UI_MENU_HDR_MIDGRAY_DESC] = "Where the scene's mid grey lands. Vanilla: where the game's own curve puts it. Render: "
"at the scene's value, a little darker.",
[UI_MENU_HDR_MATCH_SLOPE] = "Match tone slope",
[UI_MENU_HDR_MATCH_SLOPE_DESC] = "Gives the mid tones the contrast of the game's own curve.",
[UI_MENU_HDR_TONE_SLOPE] = "Tone slope",
[UI_MENU_HDR_TONE_SLOPE_DESC] = "Steepness of the tone curve through mid grey; 50 leaves it unchanged.",
[UI_MENU_HDR_HUE_CLIP] = "Hue clip emulation",
[UI_MENU_HDR_HUE_CLIP_DESC] = "How much bright colours turn as they do where the game's SDR picture clips: fire "
"towards yellow and white. 0 keeps their hue.",
[UI_MENU_SHADOW_SCALE] = "Shadow resolution",
[UI_MENU_SHADOW_SCALE_DESC] = "Sharper shadows. Higher costs more GPU power.",
[UI_MENU_PCSS] = "Soft shadows",
@@ -705,7 +667,7 @@ static const char *const text_en[UI_TEXT_COUNT] = {
[UI_MENU_FRAMEGEN] = "Frame generation",
[UI_MENU_FRAMEGEN_DESC] = "Adds generated frames for smoother motion. Needs DLSS or FSR 3.1.",
[UI_MENU_FRAMEGEN_OFF] = "Off",
[UI_MENU_HDR_TONEMAPPED] = "RenoDX", [UI_MENU_HDR_NATIVE] = "Native (the game's)",
[UI_MENU_HDR_NATIVE] = "Native (the game's)",
[UI_MENU_FRAMEGEN_NOTE] = "needs DLSS or FSR 3.1",
[UI_MENU_FRAMEGEN_NEEDS] = "choose a DLSS or FSR 3.1 mode under Upscaling first",
[UI_MENU_FRAMEGEN_NEEDS_FSR] = "choose an FSR 3.1 mode under Upscaling first",
@@ -833,44 +795,6 @@ static const char *const text_ru[UI_TEXT_COUNT] = {
[UI_MENU_HDR_GAME_DESC] = "Яркость белого в игре, в нитах.",
[UI_MENU_HDR_UI] = "Яркость интерфейса и меню",
[UI_MENU_HDR_UI_DESC] = "Яркость интерфейса и этого меню, в нитах.",
[UI_MENU_HDR_HUE] = "Коррекция оттенка",
[UI_MENU_HDR_HUE_DESC] = "Насколько яркие цвета сохраняют оттенок, который был до тональной кривой; при 0 они "
"смещаются вместе с кривой.",
[UI_MENU_HDR_GAMMA] = "Коррекция гаммы",
[UI_MENU_HDR_GAMMA_DESC] = "Показывает картинку так, как её показал бы экран с гаммой 2.2 или BT.1886 (2.4), для "
"которого игра делалась; «Выкл.» оставляет кривую sRGB с более светлыми тенями.",
[UI_MENU_HDR_TONEMAP] = "Тональная кривая",
[UI_MENU_HDR_TONEMAP_DESC] = "Vanilla: собственная кривая игры с яркостью SDR. PsychoV35: сцена через модель отклика "
"глаза, согласованная со средним серым и тоном игры, до пиковой яркости экрана. RenoDRT: "
"SDR-вид игры, доведённый до пика по яркости.",
[UI_MENU_HDR_EXPOSURE] = "Экспозиция",
[UI_MENU_HDR_EXPOSURE_DESC] = "Яркость всей картинки до тональной кривой; 100 % оставляет её без изменений.",
[UI_MENU_HDR_HIGHLIGHTS] = "Света",
[UI_MENU_HDR_HIGHLIGHTS_DESC] = "Яркость светлых участков; 50 оставляет их без изменений.",
[UI_MENU_HDR_SHADOWS] = "Тени",
[UI_MENU_HDR_SHADOWS_DESC] = "Яркость тёмных участков; 50 оставляет их без изменений.",
[UI_MENU_HDR_CONTRAST] = "Контраст",
[UI_MENU_HDR_CONTRAST_DESC] = "Контраст вокруг среднего серого; 50 оставляет его без изменений.",
[UI_MENU_HDR_SATURATION] = "Насыщенность",
[UI_MENU_HDR_SATURATION_DESC] = "Сила всех цветов; 50 оставляет её без изменений.",
[UI_MENU_HDR_HIGHLIGHT_SAT] = "Насыщенность светов",
[UI_MENU_HDR_HIGHLIGHT_SAT_DESC] = "Сила цвета самых ярких участков; 50 оставляет её без изменений.",
[UI_MENU_HDR_BLOWOUT] = "Выгорание",
[UI_MENU_HDR_BLOWOUT_DESC] = "Уводит самые яркие участки к белому; 0 сохраняет их цвет.",
[UI_MENU_HDR_FLARE] = "Засветка",
[UI_MENU_HDR_FLARE_DESC] = "Приподнимает самые тёмные участки, как немного рассеянного света; 0 оставляет чёрное чёрным.",
[UI_MENU_HDR_GRADE] = "Цветокоррекция игры",
[UI_MENU_HDR_GRADE_DESC] = "Сколько собственной цветокоррекции игры сохраняет HDR-картинка; 0 — сцена без неё.",
[UI_MENU_HDR_MIDGRAY] = "Средний серый",
[UI_MENU_HDR_MIDGRAY_DESC] = "Куда попадает средний серый сцены. Vanilla: туда же, куда его ставит кривая игры. "
"Render: на значение сцены, чуть темнее.",
[UI_MENU_HDR_MATCH_SLOPE] = "Наклон тона как в игре",
[UI_MENU_HDR_MATCH_SLOPE_DESC] = "Даёт средним тонам контраст собственной кривой игры.",
[UI_MENU_HDR_TONE_SLOPE] = "Наклон тона",
[UI_MENU_HDR_TONE_SLOPE_DESC] = "Крутизна тональной кривой у среднего серого; 50 оставляет её без изменений.",
[UI_MENU_HDR_HUE_CLIP] = "Имитация сдвига оттенка",
[UI_MENU_HDR_HUE_CLIP_DESC] = "Насколько яркие цвета сдвигаются так, как при обрезке в SDR-картинке игры: огонь к "
"жёлтому и белому. 0 сохраняет их оттенок.",
[UI_MENU_SHADOW_SCALE] = "Разрешение теней",
[UI_MENU_SHADOW_SCALE_DESC] = "Более чёткие тени. Выше — больше нагрузка на видеокарту.",
[UI_MENU_PCSS] = "Мягкие тени",
@@ -1848,44 +1772,6 @@ static const char *const text_pt_br[UI_TEXT_COUNT] = {
[UI_MENU_WALK_SCALE_DESC] = "A inclinação dos analógicos do teclado enquanto a tecla de andar está segura. Metade "
"é andar, a inclinação total é correr.",
[UI_MENU_OV_SCALE_DOWN] = "bilinear (nitidez FSR 0)",
[UI_MENU_HDR_HUE] = "Correção de matiz",
[UI_MENU_HDR_HUE_DESC] = "Quanto as cores brilhantes mantêm o matiz que tinham antes da curva de tons; 0 deixa que "
"mudem com a curva.",
[UI_MENU_HDR_GAMMA] = "Correção de gama",
[UI_MENU_HDR_GAMMA_DESC] = "Mostra a imagem como uma tela de gama 2.2 ou BT.1886 (2.4) mostraria, como o jogo foi "
"feito para ser visto; Desligado mantém a curva sRGB, com sombras mais claras.",
[UI_MENU_HDR_TONEMAP] = "Curva de tons",
[UI_MENU_HDR_TONEMAP_DESC] = "Vanilla: a curva do próprio jogo, com brilho SDR. PsychoV35: a cena por um modelo da "
"resposta do olho, ajustada ao cinza médio e ao tom do jogo, até o pico da sua tela. "
"RenoDRT: o visual SDR do jogo levado até o pico pelo brilho.",
[UI_MENU_HDR_EXPOSURE] = "Exposição",
[UI_MENU_HDR_EXPOSURE_DESC] = "Brilho de toda a imagem antes da curva de tons; 100 % a deixa como está.",
[UI_MENU_HDR_HIGHLIGHTS] = "Realces",
[UI_MENU_HDR_HIGHLIGHTS_DESC] = "Brilho das partes claras; 50 as deixa como estão.",
[UI_MENU_HDR_SHADOWS] = "Sombras",
[UI_MENU_HDR_SHADOWS_DESC] = "Brilho das partes escuras; 50 as deixa como estão.",
[UI_MENU_HDR_CONTRAST] = "Contraste",
[UI_MENU_HDR_CONTRAST_DESC] = "Contraste em torno do cinza médio; 50 o deixa como está.",
[UI_MENU_HDR_SATURATION] = "Saturação",
[UI_MENU_HDR_SATURATION_DESC] = "Força de todas as cores; 50 a deixa como está.",
[UI_MENU_HDR_HIGHLIGHT_SAT] = "Saturação dos realces",
[UI_MENU_HDR_HIGHLIGHT_SAT_DESC] = "Força das cores das partes mais claras; 50 a deixa como está.",
[UI_MENU_HDR_BLOWOUT] = "Estouro",
[UI_MENU_HDR_BLOWOUT_DESC] = "Leva as partes mais claras para o branco; 0 mantém a cor delas.",
[UI_MENU_HDR_FLARE] = "Flare",
[UI_MENU_HDR_FLARE_DESC] = "Ergue as partes mais escuras como um pouco de luz difusa faria; 0 mantém o preto preto.",
[UI_MENU_HDR_GRADE] = "Gradação de cor",
[UI_MENU_HDR_GRADE_DESC] = "Quanto da gradação de cor do próprio jogo a imagem HDR mantém; 0 é a cena sem ela.",
[UI_MENU_HDR_MIDGRAY] = "Cinza médio",
[UI_MENU_HDR_MIDGRAY_DESC] = "Onde fica o cinza médio da cena. Vanilla: onde a curva do próprio jogo o coloca. "
"Render: no valor da cena, um pouco mais escuro.",
[UI_MENU_HDR_MATCH_SLOPE] = "Igualar inclinação do tom",
[UI_MENU_HDR_MATCH_SLOPE_DESC] = "Dá aos tons médios o contraste da curva do próprio jogo.",
[UI_MENU_HDR_TONE_SLOPE] = "Inclinação do tom",
[UI_MENU_HDR_TONE_SLOPE_DESC] = "Inclinação da curva de tons no cinza médio; 50 a deixa como está.",
[UI_MENU_HDR_HUE_CLIP] = "Emulação do corte de matiz",
[UI_MENU_HDR_HUE_CLIP_DESC] = "Quanto as cores brilhantes viram como onde a imagem SDR do jogo estoura: o fogo "
"para o amarelo e o branco. 0 mantém o matiz delas.",
[UI_MENU_SHADOW_SCALE] = "Resolução das sombras",
[UI_MENU_SHADOW_SCALE_DESC] = "Sombras mais nítidas. Mais alto exige mais da placa de vídeo.",
[UI_MENU_SHADOW_RANGE] = "Alcance das cascatas de sombra",
@@ -2663,38 +2549,6 @@ static const char *const text_zh_hans[UI_TEXT_COUNT] = {
[UI_MENU_WALK_SCALE] = "步行幅度",
[UI_MENU_WALK_SCALE_DESC] = "按住步行键时键盘摇杆的推动幅度。一半为走路,推满为奔跑。",
[UI_MENU_OV_SCALE_DOWN] = "双线性(FSR 锐度 0)",
[UI_MENU_HDR_HUE] = "色调校正",
[UI_MENU_HDR_HUE_DESC] = "明亮色彩保留色调映射前色调的程度;0 让它们随曲线偏移。",
[UI_MENU_HDR_GAMMA] = "伽马校正",
[UI_MENU_HDR_GAMMA_DESC] = "按游戏设计时的观看方式,以 2.2 或 BT.1886(2.4)显示器的效果呈现画面;关闭则保留 sRGB 曲线,暗部更亮。",
[UI_MENU_HDR_TONEMAP] = "色调映射",
[UI_MENU_HDR_TONEMAP_DESC] = "Vanilla:游戏自身的曲线,SDR 亮度。PsychoV35:场景经过人眼响应模型,与游戏的中灰和影调对齐,直到显示器的峰值亮度。RenoDRT:按亮度把游戏的 SDR 观感延伸到峰值。",
[UI_MENU_HDR_EXPOSURE] = "曝光",
[UI_MENU_HDR_EXPOSURE_DESC] = "色调映射前整个画面的亮度;100 % 保持不变。",
[UI_MENU_HDR_HIGHLIGHTS] = "高光",
[UI_MENU_HDR_HIGHLIGHTS_DESC] = "明亮部分的亮度;50 保持不变。",
[UI_MENU_HDR_SHADOWS] = "阴影",
[UI_MENU_HDR_SHADOWS_DESC] = "暗部的亮度;50 保持不变。",
[UI_MENU_HDR_CONTRAST] = "对比度",
[UI_MENU_HDR_CONTRAST_DESC] = "中灰周围的对比度;50 保持不变。",
[UI_MENU_HDR_SATURATION] = "饱和度",
[UI_MENU_HDR_SATURATION_DESC] = "所有色彩的强度;50 保持不变。",
[UI_MENU_HDR_HIGHLIGHT_SAT] = "高光饱和度",
[UI_MENU_HDR_HIGHLIGHT_SAT_DESC] = "最亮部分的色彩强度;50 保持不变。",
[UI_MENU_HDR_BLOWOUT] = "过曝",
[UI_MENU_HDR_BLOWOUT_DESC] = "让最亮的部分趋向白色;0 保留其颜色。",
[UI_MENU_HDR_FLARE] = "眩光",
[UI_MENU_HDR_FLARE_DESC] = "像少量杂散光一样提亮最暗的部分;0 保持纯黑。",
[UI_MENU_HDR_GRADE] = "调色",
[UI_MENU_HDR_GRADE_DESC] = "HDR 画面保留游戏自身调色的程度;0 为不含调色的场景。",
[UI_MENU_HDR_MIDGRAY] = "中灰",
[UI_MENU_HDR_MIDGRAY_DESC] = "场景中灰落在哪里。Vanilla:游戏自身曲线给出的位置。Render:场景的原值,稍暗。",
[UI_MENU_HDR_MATCH_SLOPE] = "匹配影调斜率",
[UI_MENU_HDR_MATCH_SLOPE_DESC] = "让中间调具有游戏自身曲线的对比度。",
[UI_MENU_HDR_TONE_SLOPE] = "影调斜率",
[UI_MENU_HDR_TONE_SLOPE_DESC] = "影调曲线在中灰处的陡峭程度;50 保持不变。",
[UI_MENU_HDR_HUE_CLIP] = "色调裁切模拟",
[UI_MENU_HDR_HUE_CLIP_DESC] = "明亮色彩像游戏 SDR 画面裁切处那样偏转的程度:火焰偏向黄色和白色。0 保持其色调。",
[UI_MENU_SHADOW_SCALE] = "阴影分辨率",
[UI_MENU_SHADOW_SCALE_DESC] = "让阴影更清晰。越高越吃显卡。",
[UI_MENU_SHADOW_RANGE] = "阴影级联范围",