[PATCH xserver] glamor: Declare "pos" in the composite glyph GLSL 1.20 vertex shader

[Michel Dänzer]

On 18/08/16 09:54 AM, Keith Packard wrote:
> Michel Dänzer <michel at daenzer.net> writes:
> 
>> From: Michel Dänzer <michel.daenzer at amd.com>
>>
>> Fixes shader 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:
>> #define ATLAS_DIM_INV 0.000976562500000000
>> attribute vec2 primitive;
>> attribute vec2 source;
>> varying vec2 glyph_pos;
>> uniform vec2 fill_offset;
>> uniform vec2 fill_size_inv;
>> varying vec2 fill_pos;
>> uniform vec4 v_matrix;
>> void main() {
>>        gl_Position.xy = primitive.xy * v_matrix.xz + v_matrix.yw;
>>        gl_Position.zw = vec2(0.0,1.0);
>>        glyph_pos = source.xy * ATLAS_DIM_INV;
>>        fill_pos = (fill_offset + primitive.xy + pos) * fill_size_inv;
>> }
>>  (EE) Fatal server error:
>>  (EE) GLSL compile failure
>>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97300
>> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
> 
> Reviewed-by: Keith Packard <keithp at keithp.com>

Thanks, pushed (together with the glamor_copy_cpu_fbo bitplane support):

remote: Updating patchwork state for https://patchwork.freedesktop.org/project/Xorg/list/
remote: I: patch #105956 updated using rev cba28d572ac799391beacd89d57e69d0d7ed70e7.
remote: I: patch #105827 updated using rev be334f42a198a25e817e6dab43dd0e30aa1cd4f8.
remote: I: 2 patch(es) updated to state Accepted.
To ssh+git://git.freedesktop.org/git/xorg/xserver
   6e5bec2..be334f4  master -> master


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 163 bytes
Desc: OpenPGP digital signature
URL: <https://lists.x.org/archives/xorg-devel/attachments/20160823/fb5d54ad/attachment.sig>