From 6be12176558f193c0b6a745a24b045aad1c50403 Mon Sep 17 00:00:00 2001 From: MajorPainTheCactus Date: Fri, 11 Mar 2022 12:49:05 +0000 Subject: [PATCH] Rename and rebranding to Sony Megatron --- hdr/crt-bang-olufsen-mx8000-4k-hdr.slangp | 1 - hdr/crt-jvc-professional-TM-H1950CG-4k-hdr.slangp | 1 - hdr/crt-sammy-atomiswave-4k-hdr.slangp | 1 - ...e-4k-hdr.slangp => crt-sony-megatron-arcade.slangp} | 8 ++++++-- hdr/crt-sony-megatron-bang-olufsen-mx8000.slangp | 1 + ...dr.slangp => crt-sony-megatron-bang-olufsen.slangp} | 10 +++++++--- ...rt-sony-megatron-jvc-professional-TM-H1950CG.slangp | 1 + ...langp => crt-sony-megatron-jvc-professional.slangp} | 8 ++++++-- hdr/crt-sony-megatron-sammy-atomiswave.slangp | 1 + ...r.slangp => crt-sony-megatron-sony-pvm-20L4.slangp} | 2 +- hdr/crt-sony-megatron-sony-pvm-2730.slangp | 1 + ...4k-hdr.slangp => crt-sony-megatron-sony-pvm.slangp} | 8 ++++++-- ...gp => crt-sony-megatron-toshiba-microfilter.slangp} | 8 ++++++-- hdr/crt-sony-megatron-viewsonic-A90f+.slangp | 1 + ...p => crt-sony-megatron-viewsonic-superclear.slangp} | 8 ++++++-- hdr/crt-sony-pvm-2730-4k-hdr.slangp | 1 - hdr/crt-viewsonic-A90f+-4k-hdr.slangp | 1 - hdr/shaders/{crt-hdr.slang => crt-sony-megatron.slang} | 0 hdr/shaders/hdr10.slang | 2 +- hdr/shaders/inverse_tonemap.slang | 2 +- 20 files changed, 45 insertions(+), 21 deletions(-) delete mode 100644 hdr/crt-bang-olufsen-mx8000-4k-hdr.slangp delete mode 100644 hdr/crt-jvc-professional-TM-H1950CG-4k-hdr.slangp delete mode 100644 hdr/crt-sammy-atomiswave-4k-hdr.slangp rename hdr/{crt-arcade-4k-hdr.slangp => crt-sony-megatron-arcade.slangp} (90%) create mode 100644 hdr/crt-sony-megatron-bang-olufsen-mx8000.slangp rename hdr/{crt-bang-olufsen-4k-hdr.slangp => crt-sony-megatron-bang-olufsen.slangp} (90%) create mode 100644 hdr/crt-sony-megatron-jvc-professional-TM-H1950CG.slangp rename hdr/{crt-jvc-professional-4k-hdr.slangp => crt-sony-megatron-jvc-professional.slangp} (90%) create mode 100644 hdr/crt-sony-megatron-sammy-atomiswave.slangp rename hdr/{crt-sony-pvm-20L4-4k-hdr.slangp => crt-sony-megatron-sony-pvm-20L4.slangp} (93%) create mode 100644 hdr/crt-sony-megatron-sony-pvm-2730.slangp rename hdr/{crt-sony-pvm-4k-hdr.slangp => crt-sony-megatron-sony-pvm.slangp} (91%) rename hdr/{crt-toshiba-microfilter-4k-hdr.slangp => crt-sony-megatron-toshiba-microfilter.slangp} (87%) create mode 100644 hdr/crt-sony-megatron-viewsonic-A90f+.slangp rename hdr/{crt-viewsonic-superclear-4k-hdr.slangp => crt-sony-megatron-viewsonic-superclear.slangp} (90%) delete mode 100644 hdr/crt-sony-pvm-2730-4k-hdr.slangp delete mode 100644 hdr/crt-viewsonic-A90f+-4k-hdr.slangp rename hdr/shaders/{crt-hdr.slang => crt-sony-megatron.slang} (100%) diff --git a/hdr/crt-bang-olufsen-mx8000-4k-hdr.slangp b/hdr/crt-bang-olufsen-mx8000-4k-hdr.slangp deleted file mode 100644 index 669afed..0000000 --- a/hdr/crt-bang-olufsen-mx8000-4k-hdr.slangp +++ /dev/null @@ -1 +0,0 @@ -#reference "crt-bang-olufsen-4k-hdr.slangp" diff --git a/hdr/crt-jvc-professional-TM-H1950CG-4k-hdr.slangp b/hdr/crt-jvc-professional-TM-H1950CG-4k-hdr.slangp deleted file mode 100644 index e60804b..0000000 --- a/hdr/crt-jvc-professional-TM-H1950CG-4k-hdr.slangp +++ /dev/null @@ -1 +0,0 @@ -#reference "crt-jvc-professional-4k-hdr.slangp" \ No newline at end of file diff --git a/hdr/crt-sammy-atomiswave-4k-hdr.slangp b/hdr/crt-sammy-atomiswave-4k-hdr.slangp deleted file mode 100644 index 04706cd..0000000 --- a/hdr/crt-sammy-atomiswave-4k-hdr.slangp +++ /dev/null @@ -1 +0,0 @@ -#reference "crt-arcade-4k-hdr.slangp" \ No newline at end of file diff --git a/hdr/crt-arcade-4k-hdr.slangp b/hdr/crt-sony-megatron-arcade.slangp similarity index 90% rename from hdr/crt-arcade-4k-hdr.slangp rename to hdr/crt-sony-megatron-arcade.slangp index 01f8ba0..6726447 100644 --- a/hdr/crt-arcade-4k-hdr.slangp +++ b/hdr/crt-sony-megatron-arcade.slangp @@ -1,4 +1,7 @@ /* +Sony Megatron Colour Video Monitor +Author: Major Pain The Cactus + A shader that specifically tries to emulate arcade monitor's with an shadow mask screen but with full brightness. The novel thing about this shader is that it transforms the image output by the 'console/arcade/computer' into HDR space first i.e brightens it first and then applies @@ -10,6 +13,7 @@ Currently defaults towards a Sammy Atomiswave. To use: Please Enable HDR in RetroArch 1.10+ +[UPDATE] This shader supports SDR as well - just enable it in the shader parameters NOTE: when this shader is envoked the Contrast, Peak Luminance and Paper White Luminance in the HDR menu do nothing instead set those values through the shader parameters @@ -21,13 +25,13 @@ This shader doesn't do any geometry warping or bouncing of light around inside t Works only with the D3D11/D3D12/Vulkan drivers currently -THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - 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 - QD-OLED or LCD (and variants thereof screens are fine) - It will work just wont look right */ shaders = "1" feedback_pass = "0" -shader0 = "shaders/crt-hdr.slang" +shader0 = "shaders/crt-sony-megatron.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" mipmap_input0 = "false" diff --git a/hdr/crt-sony-megatron-bang-olufsen-mx8000.slangp b/hdr/crt-sony-megatron-bang-olufsen-mx8000.slangp new file mode 100644 index 0000000..3d7302b --- /dev/null +++ b/hdr/crt-sony-megatron-bang-olufsen-mx8000.slangp @@ -0,0 +1 @@ +#reference "crt-sony-megatron-bang-olufsen.slangp" diff --git a/hdr/crt-bang-olufsen-4k-hdr.slangp b/hdr/crt-sony-megatron-bang-olufsen.slangp similarity index 90% rename from hdr/crt-bang-olufsen-4k-hdr.slangp rename to hdr/crt-sony-megatron-bang-olufsen.slangp index 5466b35..4dd9bad 100644 --- a/hdr/crt-bang-olufsen-4k-hdr.slangp +++ b/hdr/crt-sony-megatron-bang-olufsen.slangp @@ -1,4 +1,7 @@ -/* +/* +Sony Megatron Colour Video Monitor +Author: Major Pain The Cactus + A shader that specifically tries to emulate Bang & Olufsen Beovision with a slot mask screen but with full brightness. The novel thing about this shader is that it transforms the image output by the 'console/arcade/computer' into HDR space first i.e brightens it first and then applies @@ -10,6 +13,7 @@ Currently defaults towards a Bang & Olufsen Beovision MX8000. To use: Please Enable HDR in RetroArch 1.10+ +[UPDATE] This shader supports SDR as well - just enable it in the shader parameters NOTE: when this shader is envoked the Contrast, Peak Luminance and Paper White Luminance in the HDR menu do nothing instead set those values through the shader parameters @@ -21,13 +25,13 @@ This shader doesn't do any geometry warping or bouncing of light around inside t Works only with the D3D11/D3D12/Vulkan drivers currently -THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - 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 - QD-OLED or LCD (and variants thereof screens are fine) - It will work just wont look right */ shaders = "1" feedback_pass = "0" -shader0 = "shaders/crt-hdr.slang" +shader0 = "shaders/crt-sony-megatron.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" mipmap_input0 = "false" diff --git a/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG.slangp b/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG.slangp new file mode 100644 index 0000000..f425ba5 --- /dev/null +++ b/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG.slangp @@ -0,0 +1 @@ +#reference "crt-sony-megatron-jvc-professional.slangp" \ No newline at end of file diff --git a/hdr/crt-jvc-professional-4k-hdr.slangp b/hdr/crt-sony-megatron-jvc-professional.slangp similarity index 90% rename from hdr/crt-jvc-professional-4k-hdr.slangp rename to hdr/crt-sony-megatron-jvc-professional.slangp index 6179870..236f3f4 100644 --- a/hdr/crt-jvc-professional-4k-hdr.slangp +++ b/hdr/crt-sony-megatron-jvc-professional.slangp @@ -1,4 +1,7 @@ /* +Sony Megatron Colour Video Monitor +Author: Major Pain The Cactus + A shader that specifically tries to emulate JVC professional monitor's with an shadow mask screen but with full brightness. The novel thing about this shader is that it transforms the image output by the 'console/arcade/computer' into HDR space first i.e brightens it first and then applies @@ -10,6 +13,7 @@ Currently defaults towards a JVC Professional TM-H1950CG. To use: Please Enable HDR in RetroArch 1.10+ +[UPDATE] This shader supports SDR as well - just enable it in the shader parameters NOTE: when this shader is envoked the Contrast, Peak Luminance and Paper White Luminance in the HDR menu do nothing instead set those values through the shader parameters @@ -21,13 +25,13 @@ This shader doesn't do any geometry warping or bouncing of light around inside t Works only with the D3D11/D3D12/Vulkan drivers currently -THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - 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 - QD-OLED or LCD (and variants thereof screens are fine) - It will work just wont look right */ shaders = "1" feedback_pass = "0" -shader0 = "shaders/crt-hdr.slang" +shader0 = "shaders/crt-sony-megatron.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" mipmap_input0 = "false" diff --git a/hdr/crt-sony-megatron-sammy-atomiswave.slangp b/hdr/crt-sony-megatron-sammy-atomiswave.slangp new file mode 100644 index 0000000..79530b0 --- /dev/null +++ b/hdr/crt-sony-megatron-sammy-atomiswave.slangp @@ -0,0 +1 @@ +#reference "crt-sony-megatron-arcade.slangp" \ No newline at end of file diff --git a/hdr/crt-sony-pvm-20L4-4k-hdr.slangp b/hdr/crt-sony-megatron-sony-pvm-20L4.slangp similarity index 93% rename from hdr/crt-sony-pvm-20L4-4k-hdr.slangp rename to hdr/crt-sony-megatron-sony-pvm-20L4.slangp index 8826441..eaa6d78 100644 --- a/hdr/crt-sony-pvm-20L4-4k-hdr.slangp +++ b/hdr/crt-sony-megatron-sony-pvm-20L4.slangp @@ -1,4 +1,4 @@ -#reference "crt-sony-pvm-4k-hdr.slangp" +#reference "crt-sony-megatron-sony-pvm.slangp" hcrt_crt_resolution = "1.000000" hcrt_red_vertical_convergence = "0.250000" diff --git a/hdr/crt-sony-megatron-sony-pvm-2730.slangp b/hdr/crt-sony-megatron-sony-pvm-2730.slangp new file mode 100644 index 0000000..bfae743 --- /dev/null +++ b/hdr/crt-sony-megatron-sony-pvm-2730.slangp @@ -0,0 +1 @@ +#reference "crt-sony-megatron-sony-pvm.slangp" diff --git a/hdr/crt-sony-pvm-4k-hdr.slangp b/hdr/crt-sony-megatron-sony-pvm.slangp similarity index 91% rename from hdr/crt-sony-pvm-4k-hdr.slangp rename to hdr/crt-sony-megatron-sony-pvm.slangp index 7b2bfb8..70d19b8 100644 --- a/hdr/crt-sony-pvm-4k-hdr.slangp +++ b/hdr/crt-sony-megatron-sony-pvm.slangp @@ -1,4 +1,7 @@ /* +Sony Megatron Colour Video Monitor +Author: Major Pain The Cactus + A shader that specifically tries to emulate Sony PVM's with an aperture grille screen but with full brightness. The novel thing about this shader is that it transforms the image output by the 'console/arcade/computer' into HDR space first i.e brightens it first and then applies @@ -10,6 +13,7 @@ Currently defaults towards a Sony PVM 2730QM a reasonably old mid 1980's 27" 600 To use: Please Enable HDR in RetroArch 1.10+ +[UPDATE] This shader supports SDR as well - just enable it in the shader parameters NOTE: when this shader is envoked the Contrast, Peak Luminance and Paper White Luminance in the HDR menu do nothing instead set those values through the shader parameters @@ -21,13 +25,13 @@ This shader doesn't do any geometry warping or bouncing of light around inside t Works only with the D3D11/D3D12/Vulkan drivers currently -THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - 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 - QD-OLED or LCD (and variants thereof screens are fine) - It will work just wont look right */ shaders = "1" feedback_pass = "0" -shader0 = "shaders/crt-hdr.slang" +shader0 = "shaders/crt-sony-megatron.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" mipmap_input0 = "false" diff --git a/hdr/crt-toshiba-microfilter-4k-hdr.slangp b/hdr/crt-sony-megatron-toshiba-microfilter.slangp similarity index 87% rename from hdr/crt-toshiba-microfilter-4k-hdr.slangp rename to hdr/crt-sony-megatron-toshiba-microfilter.slangp index 3097dcd..44ba70a 100644 --- a/hdr/crt-toshiba-microfilter-4k-hdr.slangp +++ b/hdr/crt-sony-megatron-toshiba-microfilter.slangp @@ -1,4 +1,7 @@ /* +Sony Megatron Colour Video Monitor +Author: Major Pain The Cactus + A shader that specifically tries to emulate Toshiba MicroFilter monitor's with an shadow mask screen but with full brightness. The novel thing about this shader is that it transforms the image output by the 'console/arcade/computer' into HDR space first i.e brightens it first and then applies @@ -10,6 +13,7 @@ Currently defaults towards a XXXX CRT MAKE MODEL XXXX. To use: Please Enable HDR in RetroArch 1.10+ +[UPDATE] This shader supports SDR as well - just enable it in the shader parameters NOTE: when this shader is envoked the Contrast, Peak Luminance and Paper White Luminance in the HDR menu do nothing instead set those values through the shader parameters @@ -21,13 +25,13 @@ This shader doesn't do any geometry warping or bouncing of light around inside t Works only with the D3D11/D3D12/Vulkan drivers currently -THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - 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 - QD-OLED or LCD (and variants thereof screens are fine) - It will work just wont look right */ shaders = "1" feedback_pass = "0" -shader0 = "shaders/crt-hdr.slang" +shader0 = "shaders/crt-sony-megatron.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" mipmap_input0 = "false" diff --git a/hdr/crt-sony-megatron-viewsonic-A90f+.slangp b/hdr/crt-sony-megatron-viewsonic-A90f+.slangp new file mode 100644 index 0000000..fe5e76b --- /dev/null +++ b/hdr/crt-sony-megatron-viewsonic-A90f+.slangp @@ -0,0 +1 @@ +#reference "crt-sony-megatron-viewsonic-superclear.slangp" \ No newline at end of file diff --git a/hdr/crt-viewsonic-superclear-4k-hdr.slangp b/hdr/crt-sony-megatron-viewsonic-superclear.slangp similarity index 90% rename from hdr/crt-viewsonic-superclear-4k-hdr.slangp rename to hdr/crt-sony-megatron-viewsonic-superclear.slangp index f82a396..821bf50 100644 --- a/hdr/crt-viewsonic-superclear-4k-hdr.slangp +++ b/hdr/crt-sony-megatron-viewsonic-superclear.slangp @@ -1,4 +1,7 @@ /* +Sony Megatron Colour Video Monitor +Author: Major Pain The Cactus + A shader that specifically tries to emulate Viewsonic SuperClear monitor's with an shadow mask screen but with full brightness. The novel thing about this shader is that it transforms the image output by the 'console/arcade/computer' into HDR space first i.e brightens it first and then applies @@ -10,6 +13,7 @@ Currently defaults towards a Viewsonic A90f+. To use: Please Enable HDR in RetroArch 1.10+ +[UPDATE] This shader supports SDR as well - just enable it in the shader parameters NOTE: when this shader is envoked the Contrast, Peak Luminance and Paper White Luminance in the HDR menu do nothing instead set those values through the shader parameters @@ -21,13 +25,13 @@ This shader doesn't do any geometry warping or bouncing of light around inside t Works only with the D3D11/D3D12/Vulkan drivers currently -THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - 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 - QD-OLED or LCD (and variants thereof screens are fine) - It will work just wont look right */ shaders = "1" feedback_pass = "0" -shader0 = "shaders/crt-hdr.slang" +shader0 = "shaders/crt-sony-megatron.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" mipmap_input0 = "false" diff --git a/hdr/crt-sony-pvm-2730-4k-hdr.slangp b/hdr/crt-sony-pvm-2730-4k-hdr.slangp deleted file mode 100644 index c79c446..0000000 --- a/hdr/crt-sony-pvm-2730-4k-hdr.slangp +++ /dev/null @@ -1 +0,0 @@ -#reference "crt-sony-pvm-4k-hdr.slangp" diff --git a/hdr/crt-viewsonic-A90f+-4k-hdr.slangp b/hdr/crt-viewsonic-A90f+-4k-hdr.slangp deleted file mode 100644 index 709cd3a..0000000 --- a/hdr/crt-viewsonic-A90f+-4k-hdr.slangp +++ /dev/null @@ -1 +0,0 @@ -#reference "crt-viewsonic-superclear-4k-hdr.slangp" \ No newline at end of file diff --git a/hdr/shaders/crt-hdr.slang b/hdr/shaders/crt-sony-megatron.slang similarity index 100% rename from hdr/shaders/crt-hdr.slang rename to hdr/shaders/crt-sony-megatron.slang diff --git a/hdr/shaders/hdr10.slang b/hdr/shaders/hdr10.slang index 94def27..1f7f913 100644 --- a/hdr/shaders/hdr10.slang +++ b/hdr/shaders/hdr10.slang @@ -1,7 +1,7 @@ #version 450 /* -Part of the crt-sony-pvm-4k-hdr shader group. Does the exact same thing as RetroArch does internally to map into HDR10 space. +Part of the crt-sony-megatron shader group. Does the exact same thing as RetroArch does internally to map into HDR10 space. This is used to do this mapping BEFORE screen effects are applied. diff --git a/hdr/shaders/inverse_tonemap.slang b/hdr/shaders/inverse_tonemap.slang index bfed3e4..e08b393 100644 --- a/hdr/shaders/inverse_tonemap.slang +++ b/hdr/shaders/inverse_tonemap.slang @@ -1,7 +1,7 @@ #version 450 /* -Part of the crt-sony-pvm-4k-hdr shader group. Does the exact same thing as RetroArch does internally to inverse tonemap from a SDR image to HDR. +Part of the crt-sony-megatron shader group. Does the exact same thing as RetroArch does internally to inverse tonemap from a SDR image to HDR. This is used to do this mapping BEFORE screen effects are applied.