Merge pull request #296 from MajorPainTheCactus/megatron_3_5

V3.5 Sony Megatron Shader
This commit is contained in:
hizzlekizzle 2022-09-17 15:39:28 -05:00 committed by GitHub
commit fceab939d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 9 additions and 16 deletions

View file

@ -5,7 +5,6 @@ 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"
hcrt_gamma_in = "1.920000"
hcrt_expand_gamut = "1.000000" hcrt_expand_gamut = "1.000000"
hcrt_red_scanline_min = "0.2000000" hcrt_red_scanline_min = "0.2000000"
hcrt_red_scanline_max = "1.050000" hcrt_red_scanline_max = "1.050000"

View file

@ -5,8 +5,6 @@ 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"
hcrt_gamma_in = "1.720000"
hcrt_expand_gamut = "1.000000"
hcrt_red_scanline_min = "0.2000000" hcrt_red_scanline_min = "0.2000000"
hcrt_red_scanline_max = "1.050000" hcrt_red_scanline_max = "1.050000"
hcrt_red_scanline_attack = "0.300000" hcrt_red_scanline_attack = "0.300000"

View file

@ -3,7 +3,6 @@
hcrt_paper_white_nits = "700.000000" 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_red_vertical_convergence = "0.000000" hcrt_red_vertical_convergence = "0.000000"
hcrt_green_vertical_convergence = "0.040000" hcrt_green_vertical_convergence = "0.040000"
hcrt_blue_vertical_convergence = "0.000000" hcrt_blue_vertical_convergence = "0.000000"

View file

@ -3,7 +3,6 @@
hcrt_crt_screen_type = "2.000000" hcrt_crt_screen_type = "2.000000"
hcrt_paper_white_nits = "600.000000" hcrt_paper_white_nits = "600.000000"
hcrt_contrast = "0.000000" hcrt_contrast = "0.000000"
hcrt_expand_gamut = "1.000000"
hcrt_red_scanline_min = "0.8900000" hcrt_red_scanline_min = "0.8900000"
hcrt_red_scanline_max = "1.000000" hcrt_red_scanline_max = "1.000000"
hcrt_red_scanline_attack = "0.300000" hcrt_red_scanline_attack = "0.300000"

View file

@ -2,7 +2,6 @@
hcrt_crt_screen_type = "2.000000" hcrt_crt_screen_type = "2.000000"
hcrt_paper_white_nits = "200.000000" hcrt_paper_white_nits = "200.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"
hcrt_blue_vertical_convergence = "-0.230000" hcrt_blue_vertical_convergence = "-0.230000"

View file

@ -5,7 +5,6 @@ hcrt_colour_system = "3.000000"
hcrt_expand_gamut = "1.000000" hcrt_expand_gamut = "1.000000"
hcrt_brightness = "0.150000" hcrt_brightness = "0.150000"
hcrt_saturation = "0.100000" hcrt_saturation = "0.100000"
hcrt_gamma_in = "2.470000"
hcrt_red_vertical_convergence = "0.000000" hcrt_red_vertical_convergence = "0.000000"
hcrt_green_vertical_convergence = "-0.150000" hcrt_green_vertical_convergence = "-0.150000"
hcrt_blue_vertical_convergence = "0.000000" hcrt_blue_vertical_convergence = "0.000000"

View file

@ -2,10 +2,8 @@
hcrt_crt_resolution = "0.000000" hcrt_crt_resolution = "0.000000"
hcrt_colour_system = "3.000000" hcrt_colour_system = "3.000000"
hcrt_expand_gamut = "1.000000"
hcrt_brightness = "0.150000" hcrt_brightness = "0.150000"
hcrt_saturation = "0.100000" hcrt_saturation = "0.100000"
hcrt_gamma_in = "2.270000"
hcrt_red_vertical_convergence = "0.000000" hcrt_red_vertical_convergence = "0.000000"
hcrt_green_vertical_convergence = "-0.150000" hcrt_green_vertical_convergence = "-0.150000"
hcrt_blue_vertical_convergence = "0.000000" hcrt_blue_vertical_convergence = "0.000000"

View file

@ -2,7 +2,6 @@
hcrt_brightness = "0.150000" hcrt_brightness = "0.150000"
hcrt_colour_system = "3.000000" hcrt_colour_system = "3.000000"
hcrt_expand_gamut = "1.000000"
hcrt_crt_resolution = "1.000000" hcrt_crt_resolution = "1.000000"
hcrt_red_vertical_convergence = "0.100000" hcrt_red_vertical_convergence = "0.100000"
hcrt_green_vertical_convergence = "0.000000" hcrt_green_vertical_convergence = "0.000000"

View file

@ -2,7 +2,6 @@
hcrt_brightness = "0.150000" hcrt_brightness = "0.150000"
hcrt_colour_system = "3.000000" hcrt_colour_system = "3.000000"
hcrt_expand_gamut = "1.000000"
hcrt_red_vertical_convergence = "-0.140000" hcrt_red_vertical_convergence = "-0.140000"
hcrt_green_vertical_convergence = "0.000000" hcrt_green_vertical_convergence = "0.000000"
hcrt_blue_vertical_convergence = "0.000000" hcrt_blue_vertical_convergence = "0.000000"

View file

@ -1,3 +1,3 @@
#reference "shaders/crt-sony-megatron-sdr.slangp" #reference "shaders/crt-sony-megatron-sdr.slangp"
hcrt_crt_screen_type = "1.000000" hcrt_crt_screen_type = "1.000000"

View file

@ -23,7 +23,7 @@ Dont use this shader directly - use the hdr\crt-make-model-hdr.slangp where make
THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - RGB QD-OLED or LCD (and variants thereof screens are fine) THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - RGB QD-OLED or LCD (and variants thereof screens are fine)
*/ */
#pragma format A2B10G10R10_UNORM_PACK32 #pragma format R16G16B16A16_SFLOAT
layout(push_constant) uniform Push layout(push_constant) uniform Push
{ {

View file

@ -2,4 +2,4 @@
hcrt_hdr = "0.000000" hcrt_hdr = "0.000000"
hcrt_gamma_in = "2.020000" hcrt_gamma_in = "2.000000"

View file

@ -23,6 +23,8 @@ Dont use this shader directly - use the hdr\crt-make-model-hdr.slangp where make
THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - RGB QD-OLED or LCD (and variants thereof screens are fine) THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - RGB QD-OLED or LCD (and variants thereof screens are fine)
*/ */
#pragma format R16G16B16A16_SFLOAT
layout(push_constant) uniform Push layout(push_constant) uniform Push
{ {
float hcrt_hdr; float hcrt_hdr;

View file

@ -36,6 +36,7 @@ scale0 = "1.0"
wrap_mode0 = "clamp_to_border" wrap_mode0 = "clamp_to_border"
mipmap_input0 = "false" mipmap_input0 = "false"
alias0 = "SourceSDR" alias0 = "SourceSDR"
float_framebuffer0 = "true"
shader1 = "crt-sony-megatron-hdr-pass.slang" shader1 = "crt-sony-megatron-hdr-pass.slang"
filter_linear1 = "false" filter_linear1 = "false"
@ -44,6 +45,7 @@ scale1 = "1.0"
wrap_mode1 = "clamp_to_border" wrap_mode1 = "clamp_to_border"
mipmap_input1 = "false" mipmap_input1 = "false"
alias1 = "SourceHDR" alias1 = "SourceHDR"
float_framebuffer1 = "true"
shader2 = "crt-sony-megatron.slang" shader2 = "crt-sony-megatron.slang"
filter_linear2 = "false" filter_linear2 = "false"

View file

@ -29,8 +29,8 @@
#pragma parameter hcrt_brightness " Brightness" 0.0 -1.0 1.0 0.01 #pragma parameter hcrt_brightness " Brightness" 0.0 -1.0 1.0 0.01
#pragma parameter hcrt_contrast " Contrast" 0.0 -1.0 1.0 0.01 #pragma parameter hcrt_contrast " Contrast" 0.0 -1.0 1.0 0.01
#pragma parameter hcrt_saturation " Saturation" 0.0 -1.0 1.0 0.01 #pragma parameter hcrt_saturation " Saturation" 0.0 -1.0 1.0 0.01
#pragma parameter hcrt_gamma_in " Gamma In" 2.22 1.22 3.22 0.01 #pragma parameter hcrt_gamma_in " Gamma In" 2.4 1.0 5.0 0.01
#pragma parameter hcrt_gamma_out " Gamma Out" 2.4 2.0 2.8 0.005 #pragma parameter hcrt_gamma_out " Gamma Out" 2.4 1.0 5.0 0.01
#pragma parameter hcrt_pin_phase " Pin Phase" 0.00 -0.2 0.2 0.01 #pragma parameter hcrt_pin_phase " Pin Phase" 0.00 -0.2 0.2 0.01
#pragma parameter hcrt_pin_amp " Pin Amp" 0.00 -0.2 0.2 0.01 #pragma parameter hcrt_pin_amp " Pin Amp" 0.00 -0.2 0.2 0.01
#pragma parameter hcrt_space3 " " 0.0 0.0 0.0001 0.0001 #pragma parameter hcrt_space3 " " 0.0 0.0 0.0001 0.0001