diff options
Diffstat (limited to 'video/out/opengl/superxbr.c')
| -rw-r--r-- | video/out/opengl/superxbr.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/video/out/opengl/superxbr.c b/video/out/opengl/superxbr.c index a88c058a38..c5b40fe36f 100644 --- a/video/out/opengl/superxbr.c +++ b/video/out/opengl/superxbr.c @@ -77,7 +77,7 @@ const struct m_sub_options superxbr_conf = { */ void pass_superxbr(struct gl_shader_cache *sc, int planes, int tex_num, - int step, const struct superxbr_opts *conf, + int step, float tex_mul, const struct superxbr_opts *conf, struct gl_transform *transform) { assert(0 <= step && step < 2); @@ -99,7 +99,7 @@ void pass_superxbr(struct gl_shader_cache *sc, int planes, int tex_num, GLSLHF("#define weight1 (%f*1.29633/10.0)\n", conf->sharpness); GLSLHF("#define weight2 (%f*1.75068/10.0/2.0)\n", conf->sharpness); - GLSLH(#define Get(x, y) (texture(tex, pos + (vec2(x, y) - vec2(0.25, 0.25)) / tex_size)[plane])) + GLSLH(#define Get(x, y) (texture(tex, pos + (vec2(x, y) - vec2(0.25, 0.25)) / tex_size)[plane] * tex_mul)) } else { *transform = (struct gl_transform){{{1.0,0.0}, {0.0,1.0}}, {0.0,0.0}}; @@ -113,7 +113,7 @@ void pass_superxbr(struct gl_shader_cache *sc, int planes, int tex_num, GLSLHF("#define weight1 (%f*1.75068/10.0)\n", conf->sharpness); GLSLHF("#define weight2 (%f*1.29633/10.0/2.0)\n", conf->sharpness); - GLSLH(#define Get(x, y) (texture(tex, pos + (vec2((x) + (y) - 1, (y) - (x))) / tex_size)[plane])) + GLSLH(#define Get(x, y) (texture(tex, pos + (vec2((x) + (y) - 1, (y) - (x))) / tex_size)[plane] * tex_mul)) } GLSLH(float df(float A, float B) { @@ -140,7 +140,7 @@ void pass_superxbr(struct gl_shader_cache *sc, int planes, int tex_num, wp3*(df(i1,e2)+df(i3,e4)+df(e1,i2)+df(e3,i4))); }) - GLSLHF("float superxbr(sampler2D tex, vec2 pos, vec2 tex_size, int plane) {\n"); + GLSLHF("float superxbr(sampler2D tex, vec2 pos, vec2 tex_size, int plane, float tex_mul) {\n"); if (step == 0) { GLSLH(vec2 dir = fract(pos * tex_size) - 0.5;) @@ -152,11 +152,11 @@ void pass_superxbr(struct gl_shader_cache *sc, int planes, int tex_num, return 0.0;) GLSLH(if (dir.x < 0 || dir.y < 0 || dist.x < 1 || dist.y < 1) - return texture(tex, pos - dir / tex_size)[plane];) + return texture(tex, pos - dir / tex_size)[plane] * tex_mul;) } else { GLSLH(vec2 dir = fract(pos * tex_size / 2) - 0.5;) GLSLH(if (dir.x * dir.y > 0) - return texture(tex, pos)[plane];) + return texture(tex, pos)[plane] * tex_mul;) } GLSLH(float P0 = Get(-1,-1); @@ -228,7 +228,7 @@ void pass_superxbr(struct gl_shader_cache *sc, int planes, int tex_num, GLSL(vec4 color = vec4(1.0);) for (int i = 0; i < planes; i++) { - GLSLF("color[%d] = superxbr(texture%d, texcoord%d, texture_size%d, %d);\n", - i, tex_num, tex_num, tex_num, i); + GLSLF("color[%d] = superxbr(texture%d, texcoord%d, texture_size%d, %d, %f);\n", + i, tex_num, tex_num, tex_num, i, tex_mul); } } |