[PATCH 02/16] glamor: Compute supported GLSL version and save in screen private

[Keith Packard]

Eric Anholt <eric at anholt.net> writes:

>> --- a/glamor/glamor_program.c
>> +++ b/glamor/glamor_program.c
>> @@ -45,9 +45,8 @@ use_tile(PixmapPtr pixmap, GCPtr gc, glamor_program *prog, void *arg)
>>  
>>  static const glamor_facet glamor_fill_tile = {
>>      .name = "tile",
>> -    .version = 130,
>> -    .vs_exec =  "       fill_pos = fill_offset + primitive.xy + pos;\n",
>> -    .fs_exec =  "       gl_FragColor = texelFetch(sampler, ivec2(mod(fill_pos,fill_size)), 0);\n",
>> +    .vs_exec =  "       fill_pos = (fill_offset + primitive.xy + pos) / fill_size;\n",
>> +    .fs_exec =  "       gl_FragColor = texture2D(sampler, fill_pos);\n",
>>      .locations = glamor_program_location_fill,
>>      .use = use_tile,
>>  };
>
> Looks like there was some squashing failure here.  I've dropped this
> hunk in applying the patch.

Yeah, this just switches tiling from texelFetch to texture2D, which
makes it not require GLSL 1.30. I'll cook up a separate patch for that
change.

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 810 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140402/b48f2e83/attachment.sig>