From 77a6d1d5611eae745646472847e0b1c5858f348f Mon Sep 17 00:00:00 2001 From: MajorPainTheCactus Date: Thu, 10 Nov 2022 21:10:29 +0000 Subject: [PATCH] Made the default white nits 200 and the default peak nits 1000 to better match the Samsung S95B Removed all nit values from the presets as this is all TV dependent --- ...t-sony-megatron-aeg-CTV-4800-VT-hdr.slangp | 1 - hdr/crt-sony-megatron-default-hdr.slangp | 25 ++++++++++++++++++- ...megatron-jvc-d-series-AV-36D501-hdr.slangp | 1 - ...megatron-jvc-d-series-AV-36D501-sdr.slangp | 1 - ...ron-jvc-professional-TM-H1950CG-hdr.slangp | 1 - ...-sony-megatron-sammy-atomiswave-hdr.slangp | 1 - ...ny-megatron-sega-virtua-fighter-hdr.slangp | 1 - ...ny-megatron-sega-virtua-fighter-sdr.slangp | 1 - ...t-sony-megatron-viewsonic-A90f+-hdr.slangp | 1 - ...t-sony-megatron-viewsonic-A90f+-sdr.slangp | 1 - hdr/shaders/hdr10.slang | 2 +- hdr/shaders/include/parameters.h | 4 +-- hdr/shaders/inverse_tonemap.slang | 4 +-- 13 files changed, 29 insertions(+), 15 deletions(-) diff --git a/hdr/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp b/hdr/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp index fdc1e60..33a05c0 100644 --- a/hdr/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp +++ b/hdr/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp @@ -41,7 +41,6 @@ srgb_framebuffer4 = "false" hcrt_hdr = "1.000000" hcrt_crt_screen_type = "2.000000" hcrt_crt_resolution = "0.000000" -hcrt_paper_white_nits = "700.000000" hcrt_expand_gamut = "0.000000" hcrt_red_vertical_convergence = "0.000000" diff --git a/hdr/crt-sony-megatron-default-hdr.slangp b/hdr/crt-sony-megatron-default-hdr.slangp index 09b3995..8125f54 100644 --- a/hdr/crt-sony-megatron-default-hdr.slangp +++ b/hdr/crt-sony-megatron-default-hdr.slangp @@ -1,2 +1,25 @@ -#reference "crt-sony-megatron-sammy-atomiswave-hdr.slangp" +#reference "shaders/crt-sony-megatron-hdr.slangp" + hcrt_crt_screen_type = "0.000000" +hcrt_colour_system = "3.000000" +hcrt_contrast = "0.000000" +hcrt_brightness = "0.000000" +hcrt_saturation = "0.450000" +hcrt_gamma_in = "2.220000" +hcrt_expand_gamut = "1.000000" +hcrt_red_scanline_min = "0.8900000" +hcrt_red_scanline_max = "1.000000" +hcrt_red_scanline_attack = "0.300000" +hcrt_green_scanline_min = "0.600000" +hcrt_green_scanline_max = "0.800000" +hcrt_green_scanline_attack = "0.300000" +hcrt_blue_scanline_min = "0.600000" +hcrt_blue_scanline_max = "0.800000" +hcrt_blue_scanline_attack = "0.300000" +hcrt_red_beam_sharpness = "1.300000" +hcrt_red_beam_attack = "1.000000" +hcrt_green_beam_sharpness = "1.300000" +hcrt_green_beam_attack = "1.000000" +hcrt_blue_beam_sharpness = "1.300000" +hcrt_blue_beam_attack = "1.000000" + diff --git a/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp b/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp index 7dfd0d1..c717341 100644 --- a/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp +++ b/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp @@ -1,7 +1,6 @@ #reference "shaders/crt-sony-megatron-hdr.slangp" hcrt_crt_screen_type = "2.000000" -hcrt_paper_white_nits = "700.000000" hcrt_brightness = "0.200000" hcrt_contrast = "0.000000" hcrt_saturation = "0.000000" diff --git a/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp b/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp index 3d99308..67fc5eb 100644 --- a/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp +++ b/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp @@ -1,7 +1,6 @@ #reference "shaders/crt-sony-megatron-sdr.slangp" hcrt_crt_screen_type = "2.000000" -hcrt_paper_white_nits = "700.000000" hcrt_brightness = "0.200000" hcrt_contrast = "0.000000" hcrt_saturation = "0.000000" diff --git a/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp b/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp index a6317c0..631fe15 100644 --- a/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp +++ b/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG-hdr.slangp @@ -1,6 +1,5 @@ #reference "shaders/crt-sony-megatron-hdr.slangp" -hcrt_paper_white_nits = "700.000000" hcrt_crt_screen_type = "1.000000" hcrt_crt_resolution = "2.000000" hcrt_expand_gamut = "1.000000" diff --git a/hdr/crt-sony-megatron-sammy-atomiswave-hdr.slangp b/hdr/crt-sony-megatron-sammy-atomiswave-hdr.slangp index ed14541..8f76bab 100644 --- a/hdr/crt-sony-megatron-sammy-atomiswave-hdr.slangp +++ b/hdr/crt-sony-megatron-sammy-atomiswave-hdr.slangp @@ -2,7 +2,6 @@ hcrt_crt_screen_type = "2.000000" hcrt_colour_system = "3.000000" -hcrt_paper_white_nits = "700.000000" hcrt_contrast = "0.000000" hcrt_brightness = "0.050000" hcrt_saturation = "0.450000" diff --git a/hdr/crt-sony-megatron-sega-virtua-fighter-hdr.slangp b/hdr/crt-sony-megatron-sega-virtua-fighter-hdr.slangp index 5ba8cf8..b5b6dec 100644 --- a/hdr/crt-sony-megatron-sega-virtua-fighter-hdr.slangp +++ b/hdr/crt-sony-megatron-sega-virtua-fighter-hdr.slangp @@ -1,7 +1,6 @@ #reference "shaders/crt-sony-megatron-hdr.slangp" hcrt_crt_screen_type = "2.000000" -hcrt_paper_white_nits = "200.000000" hcrt_expand_gamut = "1.000000" hcrt_red_vertical_convergence = "0.200000" hcrt_green_vertical_convergence = "0.200000" diff --git a/hdr/crt-sony-megatron-sega-virtua-fighter-sdr.slangp b/hdr/crt-sony-megatron-sega-virtua-fighter-sdr.slangp index c29f31b..35671c0 100644 --- a/hdr/crt-sony-megatron-sega-virtua-fighter-sdr.slangp +++ b/hdr/crt-sony-megatron-sega-virtua-fighter-sdr.slangp @@ -1,7 +1,6 @@ #reference "shaders/crt-sony-megatron-sdr.slangp" hcrt_crt_screen_type = "2.000000" -hcrt_paper_white_nits = "200.000000" hcrt_red_vertical_convergence = "0.200000" hcrt_green_vertical_convergence = "0.200000" hcrt_blue_vertical_convergence = "-0.230000" diff --git a/hdr/crt-sony-megatron-viewsonic-A90f+-hdr.slangp b/hdr/crt-sony-megatron-viewsonic-A90f+-hdr.slangp index dd3ae3a..63c8290 100644 --- a/hdr/crt-sony-megatron-viewsonic-A90f+-hdr.slangp +++ b/hdr/crt-sony-megatron-viewsonic-A90f+-hdr.slangp @@ -2,7 +2,6 @@ hcrt_crt_screen_type = "1.000000" hcrt_crt_resolution = "2.000000" -hcrt_paper_white_nits = "400.000000" hcrt_red_scanline_min = "0.5000000" hcrt_red_scanline_max = "1.000000" hcrt_red_scanline_attack = "0.350000" diff --git a/hdr/crt-sony-megatron-viewsonic-A90f+-sdr.slangp b/hdr/crt-sony-megatron-viewsonic-A90f+-sdr.slangp index 17fabf2..53f3c80 100644 --- a/hdr/crt-sony-megatron-viewsonic-A90f+-sdr.slangp +++ b/hdr/crt-sony-megatron-viewsonic-A90f+-sdr.slangp @@ -2,7 +2,6 @@ hcrt_crt_screen_type = "1.000000" hcrt_crt_resolution = "2.000000" -hcrt_paper_white_nits = "400.000000" hcrt_red_scanline_min = "0.5000000" hcrt_red_scanline_max = "1.000000" hcrt_red_scanline_attack = "0.350000" diff --git a/hdr/shaders/hdr10.slang b/hdr/shaders/hdr10.slang index 1f7f913..1eedb70 100644 --- a/hdr/shaders/hdr10.slang +++ b/hdr/shaders/hdr10.slang @@ -22,7 +22,7 @@ layout(push_constant) uniform Push float ExpandGamut; } params; -#pragma parameter PaperWhiteNits "Paper White Luminance" 450.0 0.0 10000.0 10.0 +#pragma parameter PaperWhiteNits "Paper White Luminance" 200.0 0.0 10000.0 10.0 #pragma parameter ExpandGamut "ExpandGamut" 1.0 0.0 1.0 1.0 layout(std140, set = 0, binding = 0) uniform UBO diff --git a/hdr/shaders/include/parameters.h b/hdr/shaders/include/parameters.h index e0c0aa6..1958c0a 100644 --- a/hdr/shaders/include/parameters.h +++ b/hdr/shaders/include/parameters.h @@ -16,8 +16,8 @@ #pragma parameter hcrt_colour_accurate " Mask Accurate/Colour Accurate" 1.0 0.0 1.0 1.0 #pragma parameter hcrt_colour_space " SDR: Display's Colour Space: r709 | sRGB | DCI-P3" 1.0 0.0 2.0 1.0 #pragma parameter hcrt_gamma_out " SDR: Gamma" 2.4 1.0 5.0 0.01 -#pragma parameter hcrt_max_nits " HDR: Display's Peak Luminance" 700.0 0.0 10000.0 10.0 -#pragma parameter hcrt_paper_white_nits " HDR: Display's Paper White Luminance" 700.0 0.0 10000.0 10.0 +#pragma parameter hcrt_max_nits " HDR: Display's Peak Luminance" 1000.0 0.0 10000.0 10.0 +#pragma parameter hcrt_paper_white_nits " HDR: Display's Paper White Luminance" 200.0 0.0 10000.0 10.0 #pragma parameter hcrt_expand_gamut " HDR: Original/Vivid" 0.0 0.0 1.0 1.0 #pragma parameter hcrt_lcd_resolution " Display's Resolution: 1080p | 4K | 8K" 1.0 0.0 2.0 1.0 #pragma parameter hcrt_lcd_subpixel " Display's Subpixel Layout: RGB | RWBG (OLED) | BGR" 0.0 0.0 2.0 1.0 diff --git a/hdr/shaders/inverse_tonemap.slang b/hdr/shaders/inverse_tonemap.slang index e08b393..03d63c3 100644 --- a/hdr/shaders/inverse_tonemap.slang +++ b/hdr/shaders/inverse_tonemap.slang @@ -26,8 +26,8 @@ layout(push_constant) uniform Push } params; #pragma parameter Contrast "Contrast" 3.75 0.0 10.0 0.05 -#pragma parameter PaperWhiteNits "Paper White Luminance" 450.0 0.0 10000.0 10.0 -#pragma parameter MaxNits "Peak Luminance" 700.0 0.0 10000.0 10.0 +#pragma parameter PaperWhiteNits "Paper White Luminance" 200.0 0.0 10000.0 10.0 +#pragma parameter MaxNits "Peak Luminance" 1000.0 0.0 10000.0 10.0 #pragma parameter Saturation "Saturation" 0.25 0.0 1.0 0.01 #pragma parameter DisplayGamma "Display Gamma" 2.2 0.0 5.0 0.1