[PATCH xserver] glamor: Rename var in glamor_xv, SAMPLE is GLSL keyword

Corentin Rossignon corossig at gmail.com
Fri Dec 29 10:37:59 UTC 2017


From: Corentin Rossignon <corentin.rossignon at gmail.com>

This fix issue with gnome-shell and playing video using xv

Signed-off-by: Corentin Rossignon <corentin.rossignon at gmail.com>
Bugzilla: https://bugs.freedesktop.org/104405
---
 glamor/glamor_xv.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c
index 31320d124..487927408 100644
--- a/glamor/glamor_xv.c
+++ b/glamor/glamor_xv.c
@@ -77,14 +77,14 @@ static const glamor_facet glamor_facet_xv_planar = {
                 "uniform vec4 vco;\n"
                 "varying vec2 tcs;\n"),
     .fs_exec = (
-                "        float sample;\n"
+                "        float sample_var;\n"
                 "        vec4 temp1;\n"
-                "        sample = texture2D(y_sampler, tcs).w;\n"
-                "        temp1.xyz = offsetyco.www * vec3(sample) + offsetyco.xyz;\n"
-                "        sample = texture2D(u_sampler, tcs).w;\n"
-                "        temp1.xyz = ucogamma.xyz * vec3(sample) + temp1.xyz;\n"
-                "        sample = texture2D(v_sampler, tcs).w;\n"
-                "        temp1.xyz = clamp(vco.xyz * vec3(sample) + temp1.xyz, 0.0, 1.0);\n"
+                "        sample_var = texture2D(y_sampler, tcs).w;\n"
+                "        temp1.xyz = offsetyco.www * vec3(sample_var) + offsetyco.xyz;\n"
+                "        sample_var = texture2D(u_sampler, tcs).w;\n"
+                "        temp1.xyz = ucogamma.xyz * vec3(sample_var) + temp1.xyz;\n"
+                "        sample_var = texture2D(v_sampler, tcs).w;\n"
+                "        temp1.xyz = clamp(vco.xyz * vec3(sample_var) + temp1.xyz, 0.0, 1.0);\n"
                 "        temp1.w = 1.0;\n"
                 "        gl_FragColor = temp1;\n"
                 ),
-- 
2.15.1



More information about the xorg-devel mailing list