mirror of
https://github.com/italicsjenga/slang-shaders.git
synced 2024-11-22 15:51:30 +11:00
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
This commit is contained in:
parent
c4bd56c2cb
commit
77a6d1d561
|
@ -41,7 +41,6 @@ srgb_framebuffer4 = "false"
|
||||||
hcrt_hdr = "1.000000"
|
hcrt_hdr = "1.000000"
|
||||||
hcrt_crt_screen_type = "2.000000"
|
hcrt_crt_screen_type = "2.000000"
|
||||||
hcrt_crt_resolution = "0.000000"
|
hcrt_crt_resolution = "0.000000"
|
||||||
hcrt_paper_white_nits = "700.000000"
|
|
||||||
hcrt_expand_gamut = "0.000000"
|
hcrt_expand_gamut = "0.000000"
|
||||||
|
|
||||||
hcrt_red_vertical_convergence = "0.000000"
|
hcrt_red_vertical_convergence = "0.000000"
|
||||||
|
|
|
@ -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_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"
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#reference "shaders/crt-sony-megatron-hdr.slangp"
|
#reference "shaders/crt-sony-megatron-hdr.slangp"
|
||||||
|
|
||||||
hcrt_crt_screen_type = "2.000000"
|
hcrt_crt_screen_type = "2.000000"
|
||||||
hcrt_paper_white_nits = "700.000000"
|
|
||||||
hcrt_brightness = "0.200000"
|
hcrt_brightness = "0.200000"
|
||||||
hcrt_contrast = "0.000000"
|
hcrt_contrast = "0.000000"
|
||||||
hcrt_saturation = "0.000000"
|
hcrt_saturation = "0.000000"
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#reference "shaders/crt-sony-megatron-sdr.slangp"
|
#reference "shaders/crt-sony-megatron-sdr.slangp"
|
||||||
|
|
||||||
hcrt_crt_screen_type = "2.000000"
|
hcrt_crt_screen_type = "2.000000"
|
||||||
hcrt_paper_white_nits = "700.000000"
|
|
||||||
hcrt_brightness = "0.200000"
|
hcrt_brightness = "0.200000"
|
||||||
hcrt_contrast = "0.000000"
|
hcrt_contrast = "0.000000"
|
||||||
hcrt_saturation = "0.000000"
|
hcrt_saturation = "0.000000"
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#reference "shaders/crt-sony-megatron-hdr.slangp"
|
#reference "shaders/crt-sony-megatron-hdr.slangp"
|
||||||
|
|
||||||
hcrt_paper_white_nits = "700.000000"
|
|
||||||
hcrt_crt_screen_type = "1.000000"
|
hcrt_crt_screen_type = "1.000000"
|
||||||
hcrt_crt_resolution = "2.000000"
|
hcrt_crt_resolution = "2.000000"
|
||||||
hcrt_expand_gamut = "1.000000"
|
hcrt_expand_gamut = "1.000000"
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
hcrt_crt_screen_type = "2.000000"
|
hcrt_crt_screen_type = "2.000000"
|
||||||
hcrt_colour_system = "3.000000"
|
hcrt_colour_system = "3.000000"
|
||||||
hcrt_paper_white_nits = "700.000000"
|
|
||||||
hcrt_contrast = "0.000000"
|
hcrt_contrast = "0.000000"
|
||||||
hcrt_brightness = "0.050000"
|
hcrt_brightness = "0.050000"
|
||||||
hcrt_saturation = "0.450000"
|
hcrt_saturation = "0.450000"
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#reference "shaders/crt-sony-megatron-hdr.slangp"
|
#reference "shaders/crt-sony-megatron-hdr.slangp"
|
||||||
|
|
||||||
hcrt_crt_screen_type = "2.000000"
|
hcrt_crt_screen_type = "2.000000"
|
||||||
hcrt_paper_white_nits = "200.000000"
|
|
||||||
hcrt_expand_gamut = "1.000000"
|
hcrt_expand_gamut = "1.000000"
|
||||||
hcrt_red_vertical_convergence = "0.200000"
|
hcrt_red_vertical_convergence = "0.200000"
|
||||||
hcrt_green_vertical_convergence = "0.200000"
|
hcrt_green_vertical_convergence = "0.200000"
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#reference "shaders/crt-sony-megatron-sdr.slangp"
|
#reference "shaders/crt-sony-megatron-sdr.slangp"
|
||||||
|
|
||||||
hcrt_crt_screen_type = "2.000000"
|
hcrt_crt_screen_type = "2.000000"
|
||||||
hcrt_paper_white_nits = "200.000000"
|
|
||||||
hcrt_red_vertical_convergence = "0.200000"
|
hcrt_red_vertical_convergence = "0.200000"
|
||||||
hcrt_green_vertical_convergence = "0.200000"
|
hcrt_green_vertical_convergence = "0.200000"
|
||||||
hcrt_blue_vertical_convergence = "-0.230000"
|
hcrt_blue_vertical_convergence = "-0.230000"
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
hcrt_crt_screen_type = "1.000000"
|
hcrt_crt_screen_type = "1.000000"
|
||||||
hcrt_crt_resolution = "2.000000"
|
hcrt_crt_resolution = "2.000000"
|
||||||
hcrt_paper_white_nits = "400.000000"
|
|
||||||
hcrt_red_scanline_min = "0.5000000"
|
hcrt_red_scanline_min = "0.5000000"
|
||||||
hcrt_red_scanline_max = "1.000000"
|
hcrt_red_scanline_max = "1.000000"
|
||||||
hcrt_red_scanline_attack = "0.350000"
|
hcrt_red_scanline_attack = "0.350000"
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
hcrt_crt_screen_type = "1.000000"
|
hcrt_crt_screen_type = "1.000000"
|
||||||
hcrt_crt_resolution = "2.000000"
|
hcrt_crt_resolution = "2.000000"
|
||||||
hcrt_paper_white_nits = "400.000000"
|
|
||||||
hcrt_red_scanline_min = "0.5000000"
|
hcrt_red_scanline_min = "0.5000000"
|
||||||
hcrt_red_scanline_max = "1.000000"
|
hcrt_red_scanline_max = "1.000000"
|
||||||
hcrt_red_scanline_attack = "0.350000"
|
hcrt_red_scanline_attack = "0.350000"
|
||||||
|
|
|
@ -22,7 +22,7 @@ layout(push_constant) uniform Push
|
||||||
float ExpandGamut;
|
float ExpandGamut;
|
||||||
} params;
|
} 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
|
#pragma parameter ExpandGamut "ExpandGamut" 1.0 0.0 1.0 1.0
|
||||||
|
|
||||||
layout(std140, set = 0, binding = 0) uniform UBO
|
layout(std140, set = 0, binding = 0) uniform UBO
|
||||||
|
|
|
@ -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_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_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_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_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" 700.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_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_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
|
#pragma parameter hcrt_lcd_subpixel " Display's Subpixel Layout: RGB | RWBG (OLED) | BGR" 0.0 0.0 2.0 1.0
|
||||||
|
|
|
@ -26,8 +26,8 @@ layout(push_constant) uniform Push
|
||||||
} params;
|
} params;
|
||||||
|
|
||||||
#pragma parameter Contrast "Contrast" 3.75 0.0 10.0 0.05
|
#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 PaperWhiteNits "Paper White Luminance" 200.0 0.0 10000.0 10.0
|
||||||
#pragma parameter MaxNits "Peak Luminance" 700.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 Saturation "Saturation" 0.25 0.0 1.0 0.01
|
||||||
#pragma parameter DisplayGamma "Display Gamma" 2.2 0.0 5.0 0.1
|
#pragma parameter DisplayGamma "Display Gamma" 2.2 0.0 5.0 0.1
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue