[git pull v2] glamor: gles2 text improvements + regression fix + cleanups

[Keith Packard]

Eric Anholt <eric at anholt.net> writes:

> Dave Airlie (1):
>       xserver: fix build with glamor disabled.
>
> Eric Anholt (23):
>       glamor: Fix text rendering on GLES2.
>       glamor: Drop CloseScreen-time GL resource cleanup code.
>       glamor: Use the normal GL_QUADS drawing helper in the render code.
>       glamor: Use GL_EXT_map_buffer_range if present.
>       glamor: Provide a fallback path for using an index buffer to do quads.
>       glamor: Use proper Bools for some boolean values.
>       glamor: Avoid using GL_QUADS on VC4.
>       glamor: Propagate the fact that pbo_valid is never set.
>       glamor: Remove dead gl_tex flag in the fbo struct.
>       glamor: Drop the dead "PBO" field in an FBO cache struct.
>       glamor: Move doxygen for private structs into the structs.
>       glamor: Drop dead GLAMOR_FBO_DOWNLOADED flag.
>       glamor: Drop a dead flag to glamor_create_fbo_array().
>       glamor: Simplify some temp pixmap extents calculations.
>       glamor: Drop a redundant check.
>       glamor: Fix up some weird formatting in _glamor_create_fbo_array().
>       glamor: Restore the hook to glamor_composite_rectangles().
>       glamor: Drop dead glamor_es2_pixmap_read_prepare().
>       glamor: Make a bunch of single-file glamor functions static.
>       glamor: Mark a bunch of single-file data static.
>       glamor: Use ARRAY_SIZE in a couple more places for consistency.
>       glamor: Add an assert to catch the previous bug.
>       glamor: Use GL_ARB_debug_output to log GL errors.
>
> Keith Packard (1):
>       glamor: Fix bad rendering of glyphs after an a1 glyph upload. (v3)

Merged.
   b4061cf..e3624aa  master -> master

-- 
-keith
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 810 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20150706/48f1f43f/attachment-0001.sig>