summaryrefslogtreecommitdiffstats
path: root/DOCS/man/vo.rst
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-01-25 20:24:41 +0100
committerwm4 <wm4@nowhere>2016-01-25 20:24:41 +0100
commit7f300b4204d33e33308d24eea9107ff60db36cc8 (patch)
tree57575996b86f68389295c7f88bb6b28869c4bb06 /DOCS/man/vo.rst
parenteaf2eebb50fbd7b49b12e0d08ce630e675ea414d (diff)
downloadmpv-7f300b4204d33e33308d24eea9107ff60db36cc8.tar.bz2
mpv-7f300b4204d33e33308d24eea9107ff60db36cc8.tar.xz
vo_opengl: rename custom shader entrypoint from sample to sample_pixel
"sample" is a reserved identifier at least in GLES ES. Suggestions for a better name than "sample_pixel" are still welcome. Fixes #2733.
Diffstat (limited to 'DOCS/man/vo.rst')
-rw-r--r--DOCS/man/vo.rst6
1 files changed, 5 insertions, 1 deletions
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index bc0dd9fd12..4f2641a11e 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -657,7 +657,11 @@ Available video output drivers are:
These files must define a function with the following signature::
- vec4 sample(sampler2D tex, vec2 pos, vec2 tex_size)
+ vec4 sample_pixel(sampler2D tex, vec2 pos, vec2 tex_size)
+
+ (If there is no string ``sample_pixel`` in the shader script, it will
+ use ``sample`` instead. This is a compatibility hack for older shader
+ scripts, and is deprecated.)
The meanings of the parameters are as follows: