Attachment 136444 Details for Bug 104405 – Patch for renaming sample variable

[patch] Patch for renaming sample variable

glamor_xv_GLSL.patch (text/plain), 1.81 KB, created by Corentin Rossignon on 2017-12-29 10:09:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Corentin Rossignon

Created: 2017-12-29 10:09:57 UTC

Size: 1.81 KB

patch

obsolete

>From b691591b93abb23b8f9fbb4849086de3ccbd07c7 Mon Sep 17 00:00:00 2001
>From: Corentin Rossignon <corentin.rossignon@gmail.com>
>Date: Fri, 29 Dec 2017 11:07:05 +0100
>Subject: [PATCH] Rename sample variable in glamor_xv, SAMPLE is a GLSL keyword
>
>---
> 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
>

Actions: View | Splinter Review

Attachments on bug 104405: 136429 | 136443 | 136444

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.