[PATCH xserver] glamor: Declare "pos" in glamor_dash.c

[Eric Engestrom]

On Wednesday, 2017-02-22 11:47:44 +0100, dieter.jurzitza at t-online.de wrote:
> 
> From: Dr.-Ing. Dieter Jurzitza <dieter.jurzitza at t-online.de>
> 
> Fixes compile failure:
> 
>  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
>  
>  Program source:
> #version 130
> attribute vec3 primitive;
> varying float dash_offset;
> uniform vec2 fill_offset;
> uniform vec2 fill_size_inv;
> varying vec2 fill_pos;
> uniform float dash_length;
> uniform vec4 v_matrix;
> void main() {
>        dash_offset = primitive.z / dash_length;
>        gl_Position.xy = primitive.xy.xy * v_matrix.xz + v_matrix.yw;
>        gl_Position.zw = vec2(0.0,1.0);
>        fill_pos = (fill_offset + primitive.xy + pos) * fill_size_inv;
> }
>  (EE) Fatal server error:
>  (EE) GLSL compile failure
> 
> Signed-off-by: Dr.-Ing. Dieter Jurzitza <dieter.jurzitza at t-online.de>

You should insert a line with just `---` after your signoff, or better
yet, use git and let `git send-email` handle the formatting to make it
a valid patch :)

Since Stefan tested your patch, you can also add this line (see his
reply to your previous mail) after your signoff, when you send the
properly formatted patch:
Tested-by: Stefan Dirsch <sndirsch at suse.com>

> 
> 
> [PATCH xserver] glamor: Declare "pos" in glamor_dash.c

This will be ignored, the subject of the mail is what's used as the
commit title.

> 
> --- glamor/glamor_dash.c.original       2016-03-11 19:43:16.000000000 +0100
> +++ glamor/glamor_dash.c        2017-02-19 20:00:11.883218927 +0100

git syntax is:
--- a/glamor/glamor_dash.c
+++ b/glamor/glamor_dash.c


Without these fixes, applying the patch requires a lot of manual work
from the maintainers, who are likely to not even bother ;)

Using git simplifies everything for you, the reviewers and
the maintainers, so it's highly recommended.

The link Stefan gave you [1] explains how to do this if you're not
familiar with git yet.

Cheers,
  Eric

[1] https://www.x.org/wiki/Development/Documentation/SubmittingPatches/


> @@ -32,6 +32,7 @@
> 
>  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[] =
> 
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel