Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into timing

Browse Source
This commit is contained in:
Lior Halphon 2018-03-16 12:18:18 +02:00
commit 2f1e21dc2d
5 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -235,12 +235,9 @@ $(OBJ)/%.res: %.rc
%.o: %.res %.o: %.res
cvtres /OUT:"$@" $^ cvtres /OUT:"$@" $^
# We must provide SDL2.dll with the Windows port. This is an AWFUL HACK to find it. # We must provide SDL2.dll with the Windows port.
SPACE :=
SPACE +=
$(BIN)/SDL/SDL2.dll: $(BIN)/SDL/SDL2.dll:
@$(eval POTENTIAL_MATCHES := $(subst @@@," ",$(patsubst %,%/SDL2.dll,$(subst ;,$(SPACE),$(subst $(SPACE),@@@,$(lib)))))) @$(eval MATCH := $(shell where $$LIB:SDL2.dll))
@$(eval MATCH := $(shell ls $(POTENTIAL_MATCHES) 2> NUL | head -n 1))
cp "$(MATCH)" $@ cp "$(MATCH)" $@
# Tester # Tester

8
Shaders/AAOmniScaleLegacy.fsh
View File

@ -8,10 +8,10 @@ vec4 omniScale(sampler2D image, vec2 texCoord)
{ {
vec2 pixel = texCoord * textureDimensions - vec2(0.5, 0.5); vec2 pixel = texCoord * textureDimensions - vec2(0.5, 0.5);
vec4 q11 = texture(image, vec2(floor(pixel.x) / textureDimensions.x, floor(pixel.y) / textureDimensions.y)); vec4 q11 = texture(image, (floor(pixel) + 0.5) / textureDimensions);
vec4 q12 = texture(image, vec2(floor(pixel.x) / textureDimensions.x, ceil(pixel.y) / textureDimensions.y)); vec4 q12 = texture(image, (vec2(floor(pixel.x), ceil(pixel.y)) + 0.5) / textureDimensions);
vec4 q21 = texture(image, vec2(ceil(pixel.x) / textureDimensions.x, floor(pixel.y) / textureDimensions.y)); vec4 q21 = texture(image, (vec2(ceil(pixel.x), floor(pixel.y)) + 0.5) / textureDimensions);
vec4 q22 = texture(image, vec2(ceil(pixel.x) / textureDimensions.x, ceil(pixel.y) / textureDimensions.y)); vec4 q22 = texture(image, (ceil(pixel) + 0.5) / textureDimensions);
vec2 pos = fract(pixel); vec2 pos = fract(pixel);

8
Shaders/Bilinear.fsh
View File

@ -4,10 +4,10 @@ vec4 scale(sampler2D image)
vec2 pixel = texCoord * textureDimensions - vec2(0.5, 0.5); vec2 pixel = texCoord * textureDimensions - vec2(0.5, 0.5);
vec4 q11 = texture(image, vec2(floor(pixel.x) / textureDimensions.x, floor(pixel.y) / textureDimensions.y)); vec4 q11 = texture(image, (floor(pixel) + 0.5) / textureDimensions);
vec4 q12 = texture(image, vec2(floor(pixel.x) / textureDimensions.x, ceil(pixel.y) / textureDimensions.y)); vec4 q12 = texture(image, (vec2(floor(pixel.x), ceil(pixel.y)) + 0.5) / textureDimensions);
vec4 q21 = texture(image, vec2(ceil(pixel.x) / textureDimensions.x, floor(pixel.y) / textureDimensions.y)); vec4 q21 = texture(image, (vec2(ceil(pixel.x), floor(pixel.y)) + 0.5) / textureDimensions);
vec4 q22 = texture(image, vec2(ceil(pixel.x) / textureDimensions.x, ceil(pixel.y) / textureDimensions.y)); vec4 q22 = texture(image, (ceil(pixel) + 0.5) / textureDimensions);
vec4 r1 = mix(q11, q21, fract(pixel.x)); vec4 r1 = mix(q11, q21, fract(pixel.x));
vec4 r2 = mix(q12, q22, fract(pixel.x)); vec4 r2 = mix(q12, q22, fract(pixel.x));

8
Shaders/OmniScaleLegacy.fsh
View File

@ -10,10 +10,10 @@ vec4 scale(sampler2D image)
vec2 pixel = texCoord * textureDimensions - vec2(0.5, 0.5); vec2 pixel = texCoord * textureDimensions - vec2(0.5, 0.5);
vec4 q11 = texture(image, (pixel ) / textureDimensions); vec4 q11 = texture(image, (floor(pixel) + 0.5) / textureDimensions);
vec4 q12 = texture(image, (pixel + vec2(0.0, 1.0)) / textureDimensions); vec4 q12 = texture(image, (vec2(floor(pixel.x), ceil(pixel.y)) + 0.5) / textureDimensions);
vec4 q21 = texture(image, (pixel + vec2(1.0, 0.0)) / textureDimensions); vec4 q21 = texture(image, (vec2(ceil(pixel.x), floor(pixel.y)) + 0.5) / textureDimensions);
vec4 q22 = texture(image, (pixel + vec2(1.0, 1.0)) / textureDimensions); vec4 q22 = texture(image, (ceil(pixel) + 0.5) / textureDimensions);
vec2 pos = fract(pixel); vec2 pos = fract(pixel);

14
Shaders/SmoothBilinear.fsh
View File

@ -4,15 +4,15 @@ vec4 scale(sampler2D image)
vec2 pixel = texCoord * textureDimensions - vec2(0.5, 0.5); vec2 pixel = texCoord * textureDimensions - vec2(0.5, 0.5);
vec4 q11 = texture(image, vec2(floor(pixel.x) / textureDimensions.x, floor(pixel.y) / textureDimensions.y)); vec4 q11 = texture(image, (floor(pixel) + 0.5) / textureDimensions);
vec4 q12 = texture(image, vec2(floor(pixel.x) / textureDimensions.x, ceil(pixel.y) / textureDimensions.y)); vec4 q12 = texture(image, (vec2(floor(pixel.x), ceil(pixel.y)) + 0.5) / textureDimensions);
vec4 q21 = texture(image, vec2(ceil(pixel.x) / textureDimensions.x, floor(pixel.y) / textureDimensions.y)); vec4 q21 = texture(image, (vec2(ceil(pixel.x), floor(pixel.y)) + 0.5) / textureDimensions);
vec4 q22 = texture(image, vec2(ceil(pixel.x) / textureDimensions.x, ceil(pixel.y) / textureDimensions.y)); vec4 q22 = texture(image, (ceil(pixel) + 0.5) / textureDimensions);
vec2 s = smoothstep(0., 1., fract(pixel)); vec2 s = smoothstep(0., 1., fract(pixel));
vec4 r1 = mix(q11, q21, fract(s.x)); vec4 r1 = mix(q11, q21, s.x);
vec4 r2 = mix(q12, q22, fract(s.x)); vec4 r2 = mix(q12, q22, s.x);
return mix (r1, r2, fract(s.y)); return mix (r1, r2, s.y);
} }