mirror of
https://github.com/italicsjenga/slang-shaders.git
synced 2025-02-17 07:27:43 +11:00
Merge pull request #55 from Monroe88/nes-color
Add tvout presets with nes-color-decoder
This commit is contained in:
Twinaphex
GitHub
commit
a4be4cdae4
7 changed files with 199 additions and 45 deletions
|
|
@ -19,24 +19,24 @@ layout(std140, set = 0, binding = 0) uniform UBO
|
|||
|
||||
layout(push_constant) uniform Push
|
||||
{
|
||||
float saturation;
|
||||
float hue_tweak;
|
||||
float contrast;
|
||||
float brightness;
|
||||
float gamma;
|
||||
float nes_saturation;
|
||||
float nes_hue_tweak;
|
||||
float nes_contrast;
|
||||
float nes_brightness;
|
||||
float nes_gamma;
|
||||
} params;
|
||||
|
||||
#pragma parameter saturation "Saturation" 1.0 0.0 5.0 0.05
|
||||
#pragma parameter hue_tweak "Hue" 0.0 -10.0 10.0 0.05
|
||||
#pragma parameter contrast "Contrast" 1.0 0.0 2.0 0.05
|
||||
#pragma parameter brightness "Brightness" 1.0 0.0 2.0 0.05
|
||||
#pragma parameter gamma "Gamma" 1.8 1.0 2.5 0.05
|
||||
#pragma parameter nes_saturation "Saturation" 1.0 0.0 5.0 0.05
|
||||
#pragma parameter nes_hue_tweak "Hue" 0.0 -10.0 10.0 0.05
|
||||
#pragma parameter nes_contrast "Contrast" 1.0 0.0 2.0 0.05
|
||||
#pragma parameter nes_brightness "Brightness" 1.0 0.0 2.0 0.05
|
||||
#pragma parameter nes_gamma "Gamma" 1.8 1.0 2.5 0.05
|
||||
|
||||
#define saturation params.saturation
|
||||
#define hue_tweak params.hue_tweak
|
||||
#define contrast params.contrast
|
||||
#define brightness params.brightness
|
||||
#define gamma params.gamma
|
||||
#define saturation params.nes_saturation
|
||||
#define hue_tweak params.nes_hue_tweak
|
||||
#define contrast params.nes_contrast
|
||||
#define brightness params.nes_brightness
|
||||
#define gamma params.nes_gamma
|
||||
|
||||
bool wave (int p, int color)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,24 +19,24 @@ layout(std140, set = 0, binding = 0) uniform UBO
|
|||
|
||||
layout(push_constant) uniform Push
|
||||
{
|
||||
float saturation;
|
||||
float hue_tweak;
|
||||
float contrast;
|
||||
float brightness;
|
||||
float gamma;
|
||||
float nes_saturation;
|
||||
float nes_hue_tweak;
|
||||
float nes_contrast;
|
||||
float nes_brightness;
|
||||
float nes_gamma;
|
||||
} params;
|
||||
|
||||
#pragma parameter saturation "Saturation" 1.0 0.0 5.0 0.05
|
||||
#pragma parameter hue_tweak "Hue" 0.0 -10.0 10.0 0.05
|
||||
#pragma parameter contrast "Contrast" 1.0 0.0 2.0 0.05
|
||||
#pragma parameter brightness "Brightness" 1.0 0.0 2.0 0.05
|
||||
#pragma parameter gamma "Gamma" 1.8 1.0 2.5 0.05
|
||||
#pragma parameter nes_saturation "Saturation" 1.0 0.0 5.0 0.05
|
||||
#pragma parameter nes_hue_tweak "Hue" 0.0 -10.0 10.0 0.05
|
||||
#pragma parameter nes_contrast "Contrast" 1.0 0.0 2.0 0.05
|
||||
#pragma parameter nes_brightness "Brightness" 1.0 0.0 2.0 0.05
|
||||
#pragma parameter nes_gamma "Gamma" 1.8 1.0 2.5 0.05
|
||||
|
||||
#define saturation params.saturation
|
||||
#define hue_tweak params.hue_tweak
|
||||
#define contrast params.contrast
|
||||
#define brightness params.brightness
|
||||
#define gamma params.gamma
|
||||
#define saturation params.nes_saturation
|
||||
#define hue_tweak params.nes_hue_tweak
|
||||
#define contrast params.nes_contrast
|
||||
#define brightness params.nes_brightness
|
||||
#define gamma params.nes_gamma
|
||||
|
||||
bool wave (int p, int color)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,24 +19,24 @@ layout(std140, set = 0, binding = 0) uniform UBO
|
|||
|
||||
layout(push_constant) uniform Push
|
||||
{
|
||||
float saturation;
|
||||
float hue_tweak;
|
||||
float contrast;
|
||||
float brightness;
|
||||
float gamma;
|
||||
float nes_saturation;
|
||||
float nes_hue_tweak;
|
||||
float nes_contrast;
|
||||
float nes_brightness;
|
||||
float nes_gamma;
|
||||
} params;
|
||||
|
||||
#pragma parameter saturation "Saturation" 1.0 0.0 5.0 0.05
|
||||
#pragma parameter hue_tweak "Hue" 0.0 -10.0 10.0 0.05
|
||||
#pragma parameter contrast "Contrast" 1.0 0.0 2.0 0.05
|
||||
#pragma parameter brightness "Brightness" 1.0 0.0 2.0 0.05
|
||||
#pragma parameter gamma "Gamma" 1.8 1.0 2.5 0.05
|
||||
#pragma parameter nes_saturation "Saturation" 1.0 0.0 5.0 0.05
|
||||
#pragma parameter nes_hue_tweak "Hue" 0.0 -10.0 10.0 0.05
|
||||
#pragma parameter nes_contrast "Contrast" 1.0 0.0 2.0 0.05
|
||||
#pragma parameter nes_brightness "Brightness" 1.0 0.0 2.0 0.05
|
||||
#pragma parameter nes_gamma "Gamma" 1.8 1.0 2.5 0.05
|
||||
|
||||
#define saturation params.saturation
|
||||
#define hue_tweak params.hue_tweak
|
||||
#define contrast params.contrast
|
||||
#define brightness params.brightness
|
||||
#define gamma params.gamma
|
||||
#define saturation params.nes_saturation
|
||||
#define hue_tweak params.nes_hue_tweak
|
||||
#define contrast params.nes_contrast
|
||||
#define brightness params.nes_brightness
|
||||
#define gamma params.nes_gamma
|
||||
|
||||
bool wave (int p, int color)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
#tvout preset for 480p CRTs
|
||||
|
||||
shaders = "4"
|
||||
shader0 = "../../misc/nes-color-decoder.slang"
|
||||
shader1 = "../../crt/shaders/tvout-tweaks.slang"
|
||||
shader2 = "../../misc/image-adjustment.slang"
|
||||
shader3 = "../../misc/interlacing.slang"
|
||||
|
||||
scale_type0 = source
|
||||
scale0 = 1.0
|
||||
filter_linear0 = false
|
||||
|
||||
scale_type_x1 = "viewport"
|
||||
scale_x1 = "1.000000"
|
||||
scale_type_y1 = "source"
|
||||
scale_y1 = "1.000000"
|
||||
|
||||
parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
|
||||
TVOUT_RESOLUTION = "320.000000"
|
||||
TVOUT_COMPOSITE_CONNECTION = "0.000000"
|
||||
TVOUT_TV_COLOR_LEVELS = "0.000000"
|
||||
target_gamma = "2.200000"
|
||||
monitor_gamma = "2.200000"
|
||||
overscan_percent_x = "0.000000"
|
||||
overscan_percent_y = "0.000000"
|
||||
saturation = "1.000000"
|
||||
contrast = "1.000000"
|
||||
luminance = "1.000000"
|
||||
bright_boost = "0.000000"
|
||||
R = "1.000000"
|
||||
G = "1.000000"
|
||||
B = "1.000000"
|
||||
46
presets/tvout+interlacing/tvout+ntsc-nes+interlacing.slangp
Normal file
46
presets/tvout+interlacing/tvout+ntsc-nes+interlacing.slangp
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
shaders = 6
|
||||
shader0 = ../../misc/nes-color-decoder.slang
|
||||
shader1 = ../../ntsc/shaders/ntsc-pass1-composite-3phase.slang
|
||||
shader2 = ../../ntsc/shaders/ntsc-pass2-3phase.slang
|
||||
shader3 = ../../crt/shaders/tvout-tweaks.slang
|
||||
shader4 = ../../misc/image-adjustment.slang
|
||||
shader5 = ../../misc/interlacing.slang
|
||||
|
||||
filter_linear0 = false
|
||||
filter_linear1 = false
|
||||
filter_linear2 = false
|
||||
|
||||
scale_type0 = source
|
||||
scale0 = 1.0
|
||||
|
||||
scale_type_x1 = absolute
|
||||
scale_type_y1 = source
|
||||
scale_x1 = 1024
|
||||
scale_y1 = 1.0
|
||||
frame_count_mod1 = 2
|
||||
float_framebuffer1 = true
|
||||
|
||||
scale_type2 = source
|
||||
scale_x2 = 0.5
|
||||
scale_y2 = 1.0
|
||||
|
||||
scale_type_x3 = "viewport"
|
||||
scale_x3 = "1.000000"
|
||||
scale_type_y3 = "source"
|
||||
scale_y3 = "1.000000"
|
||||
|
||||
parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
|
||||
TVOUT_RESOLUTION = "512.000000"
|
||||
TVOUT_COMPOSITE_CONNECTION = "0.000000"
|
||||
TVOUT_TV_COLOR_LEVELS = "0.000000"
|
||||
target_gamma = "2.200000"
|
||||
monitor_gamma = "2.200000"
|
||||
overscan_percent_x = "0.000000"
|
||||
overscan_percent_y = "0.000000"
|
||||
saturation = "1.000000"
|
||||
contrast = "1.000000"
|
||||
luminance = "1.000000"
|
||||
bright_boost = "0.000000"
|
||||
R = "1.000000"
|
||||
G = "1.000000"
|
||||
B = "1.000000"
|
||||
31
presets/tvout/tvout+nes-color-decoder.slangp
Normal file
31
presets/tvout/tvout+nes-color-decoder.slangp
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
#tvout preset for 240p CRTs
|
||||
|
||||
shaders = "3"
|
||||
shader0 = "../../misc/nes-color-decoder.slang"
|
||||
shader1 = "../../crt/shaders/tvout-tweaks.slang"
|
||||
shader2 = "../../misc/image-adjustment.slang"
|
||||
|
||||
scale_type0 = source
|
||||
scale0 = 1.0
|
||||
filter_linear0 = false
|
||||
|
||||
scale_type_x1 = "viewport"
|
||||
scale_x1 = "1.000000"
|
||||
scale_type_y1 = "source"
|
||||
scale_y1 = "1.000000"
|
||||
|
||||
parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
|
||||
TVOUT_RESOLUTION = "320.000000"
|
||||
TVOUT_COMPOSITE_CONNECTION = "0.000000"
|
||||
TVOUT_TV_COLOR_LEVELS = "0.000000"
|
||||
target_gamma = "2.200000"
|
||||
monitor_gamma = "2.200000"
|
||||
overscan_percent_x = "0.000000"
|
||||
overscan_percent_y = "0.000000"
|
||||
saturation = "1.000000"
|
||||
contrast = "1.000000"
|
||||
luminance = "1.000000"
|
||||
bright_boost = "0.000000"
|
||||
R = "1.000000"
|
||||
G = "1.000000"
|
||||
B = "1.000000"
|
||||
45
presets/tvout/tvout+ntsc-nes.slangp
Normal file
45
presets/tvout/tvout+ntsc-nes.slangp
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
shaders = 5
|
||||
shader0 = ../../misc/nes-color-decoder.slang
|
||||
shader1 = ../../ntsc/shaders/ntsc-pass1-composite-3phase.slang
|
||||
shader2 = ../../ntsc/shaders/ntsc-pass2-3phase.slang
|
||||
shader3 = ../../crt/shaders/tvout-tweaks.slang
|
||||
shader4 = ../../misc/image-adjustment.slang
|
||||
|
||||
filter_linear0 = false
|
||||
filter_linear1 = false
|
||||
filter_linear2 = false
|
||||
|
||||
scale_type0 = source
|
||||
scale0 = 1.0
|
||||
|
||||
scale_type_x1 = absolute
|
||||
scale_type_y1 = source
|
||||
scale_x1 = 1024
|
||||
scale_y1 = 1.0
|
||||
frame_count_mod1 = 2
|
||||
float_framebuffer1 = true
|
||||
|
||||
scale_type2 = source
|
||||
scale_x2 = 0.5
|
||||
scale_y2 = 1.0
|
||||
|
||||
scale_type_x3 = "viewport"
|
||||
scale_x3 = "1.000000"
|
||||
scale_type_y3 = "source"
|
||||
scale_y3 = "1.000000"
|
||||
|
||||
parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B"
|
||||
TVOUT_RESOLUTION = "512.000000"
|
||||
TVOUT_COMPOSITE_CONNECTION = "0.000000"
|
||||
TVOUT_TV_COLOR_LEVELS = "0.000000"
|
||||
target_gamma = "2.200000"
|
||||
monitor_gamma = "2.200000"
|
||||
overscan_percent_x = "0.000000"
|
||||
overscan_percent_y = "0.000000"
|
||||
saturation = "1.000000"
|
||||
contrast = "1.000000"
|
||||
luminance = "1.000000"
|
||||
bright_boost = "0.000000"
|
||||
R = "1.000000"
|
||||
G = "1.000000"
|
||||
B = "1.000000"
|
||||
Loading…
Add table
Reference in a new issue