Merge pull request #67 from Tatsuya79/master

GB borders nvidia fix and new presets.
This commit is contained in:
hizzlekizzle 2017-09-06 15:20:01 -05:00 committed by GitHub
commit b4f06dc151
12 changed files with 42 additions and 22 deletions

View file

@ -40,9 +40,6 @@ video_scale = "3.0"
SCALE = "0.6667"
OUT_X = "1600.0"
OUT_Y = "800.0"
adjacent_texel_alpha_blending = "0.38"
pixel_opacity = "0.90"
shadow_opacity = "0.90"
textures = COLOR_PALETTE;BACKGROUND;BORDER
COLOR_PALETTE = resources/dmg-palette.png

View file

@ -38,9 +38,6 @@ video_scale = "3.0"
SCALE = "1.0"
OUT_X = "2400.0"
OUT_Y = "1200.0"
adjacent_texel_alpha_blending = "0.42"
pixel_opacity = "0.80"
shadow_opacity = "0.80"
textures = COLOR_PALETTE;BACKGROUND;BORDER
COLOR_PALETTE = resources/dmg-palette.png

View file

@ -38,9 +38,6 @@ video_scale = "4.0"
SCALE = "1.0"
OUT_X = "3200.0"
OUT_Y = "1600.0"
adjacent_texel_alpha_blending = "0.34"
pixel_opacity = "0.80"
shadow_opacity = "0.80"
textures = COLOR_PALETTE;BACKGROUND;BORDER
COLOR_PALETTE = resources/dmg-palette.png

View file

@ -38,9 +38,6 @@ video_scale = "4.0"
SCALE = "1.25"
OUT_X = "4000.0"
OUT_Y = "2000.0"
adjacent_texel_alpha_blending = "0.34"
pixel_opacity = "0.80"
shadow_opacity = "0.80"
textures = COLOR_PALETTE;BACKGROUND;BORDER
COLOR_PALETTE = resources/dmg-palette.png

View file

@ -38,9 +38,6 @@ video_scale = "4.0"
SCALE = "1.5"
OUT_X = "4800.0"
OUT_Y = "2400.0"
adjacent_texel_alpha_blending = "0.34"
pixel_opacity = "0.80"
shadow_opacity = "0.80"
textures = COLOR_PALETTE;BACKGROUND;BORDER
COLOR_PALETTE = resources/dmg-palette.png

View file

@ -35,11 +35,18 @@ filter_linear5 = true
scale_type5 = source
scale5 = 1.0
parameters = "video_scale;SCALE;OUT_X;OUT_Y"
parameters = "video_scale;SCALE;OUT_X;OUT_Y;baseline_alpha;grey_balance;contrast;screen_light;pixel_opacity;shadow_offset_x"
video_scale = "3.0"
SCALE = "0.6667"
OUT_X = "1600.0"
OUT_Y = "800.0"
baseline_alpha = "0.03"
grey_balance = "3.5"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
shadow_opacity = "0.9"
shadow_offset_x = "-2.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER
COLOR_PALETTE = resources/pocket-palette.png

View file

@ -33,11 +33,18 @@ alias4 = "PASS4"
shader5 = shader-files/gb-pass-5.slang
filter_linear5 = true
parameters = "video_scale;SCALE;OUT_X;OUT_Y"
parameters = "video_scale;SCALE;OUT_X;OUT_Y;baseline_alpha;grey_balance;contrast;screen_light;pixel_opacity;shadow_offset_x"
video_scale = "3.0"
SCALE = "1.0"
OUT_X = "2400.0"
OUT_Y = "1200.0"
baseline_alpha = "0.03"
grey_balance = "3.5"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
shadow_opacity = "0.9"
shadow_offset_x = "-2.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER
COLOR_PALETTE = resources/pocket-palette.png

View file

@ -33,11 +33,18 @@ alias4 = "PASS4"
shader5 = shader-files/gb-pass-5.slang
filter_linear5 = true
parameters = "video_scale;SCALE;OUT_X;OUT_Y"
parameters = "video_scale;SCALE;OUT_X;OUT_Y;baseline_alpha;grey_balance;contrast;screen_light;pixel_opacity;shadow_offset_x"
video_scale = "4.0"
SCALE = "1.0"
OUT_X = "3200.0"
OUT_Y = "1600.0"
baseline_alpha = "0.03"
grey_balance = "3.5"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
shadow_opacity = "0.9"
shadow_offset_x = "-2.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER
COLOR_PALETTE = resources/pocket-palette.png

View file

@ -33,11 +33,18 @@ alias4 = "PASS4"
shader5 = shader-files/gb-pass-5.slang
filter_linear5 = true
parameters = "video_scale;SCALE;OUT_X;OUT_Y"
parameters = "video_scale;SCALE;OUT_X;OUT_Y;baseline_alpha;grey_balance;contrast;screen_light;pixel_opacity;shadow_offset_x"
video_scale = "4.0"
SCALE = "1.25"
OUT_X = "4000.0"
OUT_Y = "2000.0"
baseline_alpha = "0.03"
grey_balance = "3.5"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
shadow_opacity = "0.9"
shadow_offset_x = "-2.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER
COLOR_PALETTE = resources/pocket-palette.png

View file

@ -33,11 +33,18 @@ alias4 = "PASS4"
shader5 = shader-files/gb-pass-5.slang
filter_linear5 = true
parameters = "video_scale;SCALE;OUT_X;OUT_Y"
parameters = "video_scale;SCALE;OUT_X;OUT_Y;baseline_alpha;grey_balance;contrast;screen_light;pixel_opacity;shadow_offset_x"
video_scale = "4.0"
SCALE = "1.5"
OUT_X = "4800.0"
OUT_Y = "2400.0"
baseline_alpha = "0.03"
grey_balance = "3.5"
contrast = "0.8"
screen_light = "0.9"
pixel_opacity = "0.95"
shadow_opacity = "0.9"
shadow_offset_x = "-2.0"
textures = COLOR_PALETTE;BACKGROUND;BORDER
COLOR_PALETTE = resources/pocket-palette.png

View file

@ -86,7 +86,7 @@ void main()
vec2 scaled_video_out = (registers.SourceSize.xy * vec2(registers.video_scale));
// Remaps position to integer scaled output
gl_Position = global.MVP * Position / vec4( vec2(registers.OutputSize.xy / scaled_video_out), 1.0, 1.0 );
vTexCoord = TexCoord;// + half_pixel;
vTexCoord = TexCoord + half_pixel;
dot_size = registers.SourceSize.zw;
one_texel = 1.0 / (registers.SourceSize.xy * registers.video_scale);
}

View file

@ -126,7 +126,7 @@ layout(set = 0, binding = 4) uniform sampler2D COLOR_PALETTE;
void main()
{
vec2 tex = floor(registers.PassOutputSize1.xy * vTexCoord);
tex = (tex ) * registers.PassOutputSize1.zw;
tex = (tex + 0.5) * registers.PassOutputSize1.zw;
// Sample all the relevant textures
vec4 foreground = texture(PassOutput1, tex - screen_offset);