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

[Corentin Rossignon]

I am using RadeonSI (mesa) but the real problem is that #version is missing.
I sent a new patch for declaring OpenGL version in glamor xv shader.

2018-01-04 2:11 GMT+01:00 Eric Anholt :

> Corentin Rossignon  writes:
>
> > From: Corentin Rossignon 
> >
> > This fix issue with gnome-shell and playing video using xv
> >
> > Signed-off-by: Corentin Rossignon 
> > Bugzilla: https://bugs.freedesktop.org/104405
>
> This is weird -- sample is only a keyword in late versions of GLSL, and
> we shouldn't be requesting a late version of GLSL (#version exists so
> that the language can evolve without breaking old shaders!)  What driver
> was doing this?
>
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

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

[Eric Anholt]

Corentin Rossignon  writes:

> From: Corentin Rossignon 
>
> This fix issue with gnome-shell and playing video using xv
>
> Signed-off-by: Corentin Rossignon 
> Bugzilla: https://bugs.freedesktop.org/104405

This is weird -- sample is only a keyword in late versions of GLSL, and
we shouldn't be requesting a late version of GLSL (#version exists so
that the language can evolve without breaking old shaders!)  What driver
was doing this?


signature.asc
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

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

[Corentin Rossignon]

From: Corentin Rossignon 

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

Signed-off-by: Corentin Rossignon 
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

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel