xserver: Branch 'master'

[Michel Dänzer]

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

New commits:
commit 0c1574d9882a91b2c1a046bf4ac5a9b138a37965
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Mar 9 18:13:31 2017 +0900

    glamor: Fix typo: "vec2_pos" -> "vec2 pos"
    
    Fixes crash when trying to use dashed lines:
    
     Failed to compile VS: 0:8(2): error: `vec2_pos' undeclared
    
    Trivial.
    
    Fixes: 	d8161aeb5089 ("glamor: Fix missing declaration in dash vertex
                           shader")
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99943

diff --git a/glamor/glamor_dash.c b/glamor/glamor_dash.c
index 9bc6b9a..78a4fa3 100644
--- a/glamor/glamor_dash.c
+++ b/glamor/glamor_dash.c
@@ -32,7 +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"
+    "       vec2 pos = vec2(0,0);\n"
     GLAMOR_POS(gl_Position, primitive.xy);
 
 static const char dash_fs_vars[] =