Same pull request as the previous one, just with keithp's LSB-aware a1 text regression fix instead of mine.
The following changes since commit b4061cf5f76241157b2dc81dec053012075311c0: Fix border tile origin when background is ParentRelative (2015-06-29 21:07:58 -0700) are available in the git repository at: git://people.freedesktop.org/~anholt/xserver glamor-next-3 for you to fetch changes up to e3624aa5fde658c44724a7ea21f5df9e3c586923: xserver: fix build with glamor disabled. (2015-07-06 12:01:33 -0700) ---------------------------------------------------------------- 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) glamor/glamor.c | 123 +++++++++++- glamor/glamor_composite_glyphs.c | 65 ++++--- glamor/glamor_core.c | 13 +- glamor/glamor_fbo.c | 51 ++--- glamor/glamor_gradient.c | 21 --- glamor/glamor_largepixmap.c | 26 +-- glamor/glamor_pixmap.c | 91 +-------- glamor/glamor_priv.h | 228 ++++++++--------------- glamor/glamor_program.c | 14 +- glamor/glamor_render.c | 82 +------- glamor/glamor_transfer.c | 2 + glamor/glamor_utils.h | 7 +- glamor/glamor_vbo.c | 1 - hw/xfree86/drivers/modesetting/driver.c | 4 + hw/xfree86/drivers/modesetting/drmmode_display.c | 3 +- hw/xfree86/drivers/modesetting/present.c | 2 +- 16 files changed, 291 insertions(+), 442 deletions(-)
signature.asc
Description: PGP signature
_______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel