xserver: Branch 'master'

[Adam Jackson]

 glamor/glamor_dash.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit d8161aeb50891ae10c5656487ce8f982deed5f9f
Author: Dr.-Ing. Dieter Jurzitza <dieter.jurzitza at t-online.de>
Date:   Thu Feb 23 12:57:26 2017 -0500

    glamor: Fix missing declaration in dash vertex shader
    
    Fixes a GLSL compilation error:
    
    Failed to compile VS: 0:13(43): error: `pos' undeclared
    0:13(14): error: operands to arithmetic operators must be numeric
    0:13(13): error: operands to arithmetic operators must be numeric
    
    Tested-by: Stefan Dirsch <sndirsch at suse.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/glamor/glamor_dash.c b/glamor/glamor_dash.c
index 3c19dba..9bc6b9a 100644
--- a/glamor/glamor_dash.c
+++ b/glamor/glamor_dash.c
@@ -32,6 +32,7 @@ static const char dash_vs_vars[] =
 
 static const char dash_vs_exec[] =
     "       dash_offset = primitive.z / dash_length;\n"
+    "       vec2_pos = vec2(0,0);\n"
     GLAMOR_POS(gl_Position, primitive.xy);
 
 static const char dash_fs_vars[] =