diff options
| author | Niklas Haas <git@nand.wakku.to> | 2015-02-27 04:32:22 +0100 |
|---|---|---|
| committer | Niklas Haas <git@nand.wakku.to> | 2015-02-27 04:35:15 +0100 |
| commit | 0da6a7346ae9c2dde2008f664da990bce15f77ab (patch) | |
| tree | 0b1db229e69ac72d886af15b5a95a14c9aef7d9f /video/out/gl_video.c | |
| parent | 6e73b4dac726588ed3737a6918c7629e263eae1b (diff) | |
| download | mpv-0da6a7346ae9c2dde2008f664da990bce15f77ab.tar.bz2 mpv-0da6a7346ae9c2dde2008f664da990bce15f77ab.tar.xz | |
vo_opengl: implement antiringing for tensor scalers
This is based on pretty much the same (somewhat naive) logic right now.
I'm not convinced that the extra logic that eg. madVR includes is worth
enough to warrant heavily confusing the logic for it.
This shouldn't slow down the logic at all in any sane shader compiler,
and indeed it doesn't on any shader compiler that I tested.
Note that this currently doesn't affect cscale at all, due to the weird
implementation details of that.
Diffstat (limited to 'video/out/gl_video.c')
| -rw-r--r-- | video/out/gl_video.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c index ac2b8a8787..d812ad7960 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -866,9 +866,9 @@ static void shader_setup_scaler(char **shader, struct scaler *scaler, int pass) // The direction/pass assignment is rather arbitrary, but fixed in // other parts of the code (like FBO setup). const char *direction = pass == 0 ? "0, 1" : "1, 0"; - // SAMPLE_CONVOLUTION_SEP_N(NAME, DIR, N, LUT, WEIGHTS_FUNC) - APPENDF(shader, "SAMPLE_CONVOLUTION_SEP_N(%s, vec2(%s), %d, %s, %s)\n", - name, direction, size, lut_tex, lut_fn); + // SAMPLE_CONVOLUTION_SEP_N(NAME, DIR, N, LUT, WEIGHTS_FUNC, ANTIRING) + APPENDF(shader, "SAMPLE_CONVOLUTION_SEP_N(%s, vec2(%s), %d, %s, %s, %f)\n", + name, direction, size, lut_tex, lut_fn, scaler->antiring); } else { // SAMPLE_CONVOLUTION_N(NAME, N, LUT, WEIGHTS_FUNC) APPENDF(shader, "SAMPLE_CONVOLUTION_N(%s, %d, %s, %s)\n", |