Eric Anholt <[email protected]> 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. -- [email protected]
pgpg5J1Brb10t.pgp
Description: PGP signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
