xserver: Branch 'master'

[Adam Jackson]

 glamor/glamor_xv.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit dbfbe58b94ec07a45fd6170f96bffec55051724e
Author: Corentin Rossignon <corentin.rossignon at gmail.com>
Date:   Thu Jan 4 08:34:01 2018 +0100

    glamor: Specify GLSL version for xv shader
    
    SAMPLE is a GLSL keyword in newer OpenGL version.
    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
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c
index 31320d124..e0375d7cd 100644
--- a/glamor/glamor_xv.c
+++ b/glamor/glamor_xv.c
@@ -62,6 +62,8 @@ typedef struct tagREF_TRANSFORM {
 static const glamor_facet glamor_facet_xv_planar = {
     .name = "xv_planar",
 
+    .version = 120,
+
     .source_name = "v_texcoord0",
     .vs_vars = ("attribute vec2 position;\n"
                 "attribute vec2 v_texcoord0;\n"