From b069672ace2b762f400ca6d318571cbedf5141f2 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Thu, 31 Mar 2016 20:00:37 +1100 Subject: [PATCH 1/3] glcolorconvert: don't use the predefined variable name sample Using 'sample' as a variable name is an error in GLES3 Upstream-Status: Backport [1.9.1] --- gst-libs/gst/gl/gstglcolorconvert.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/gl/gstglcolorconvert.c b/gst-libs/gst/gl/gstglcolorconvert.c index f478faa..c23624f 100644 --- a/gst-libs/gst/gl/gstglcolorconvert.c +++ b/gst-libs/gst/gl/gstglcolorconvert.c @@ -261,9 +261,9 @@ static const struct shader_templ templ_RGB_to_PLANAR_YUV = " for (int j = 0; j < int(chroma_sampling.y); j++) {\n" " int n = (i+1)*(j+1);\n" " delta.y = float(j);\n" - " vec4 sample = texture2D(tex, (chroma_pos + delta) / unnormalization).%c%c%c%c;\n" + " vec4 s = texture2D(tex, (chroma_pos + delta) / unnormalization).%c%c%c%c;\n" /* rolling average */ - " uv_texel = (float(n-1) * uv_texel + sample) / float(n);\n" + " uv_texel = (float(n-1) * uv_texel + s) / float(n);\n" " }\n" " }\n" "}\n" -- 1.9.1