[PULL] reviewed glamor changes
Eric Anholt
eric at anholt.net
Fri Feb 14 18:34:10 PST 2014
Here's the pull request for the reviewed parts of the glamor stuff I'd
sent out last week. I dropped the xephyr parts since keithp had some
comments about fixing the init sequence (and there's definitely some
bogus stuff in the init sequence I had).
Hopefully next week I can get out a series that does xephyr and a xorg
module.
The following changes since commit f34dc7fa96457ea6a0703493d74e63cca357712e:
XQuartz: pointer -> void * (2014-02-14 00:33:38 -0800)
are available in the git repository at:
git://people.freedesktop.org/~anholt/xserver glamor-pull-request
for you to fetch changes up to 3d71df48e70884deccb293cf1fcffbdba8efd94b:
glamor: Move the EGL DRI3 code to GLAMOR_HAS_GBM. (2014-02-14 18:30:01 -0800)
----------------------------------------------------------------
Eric Anholt (17):
glamor: Convert to using libepoxy.
glamor: Rename glamor_get/put_dispatch to glamor_get/put_context.
glamor: Put in a pluggable context switcher for GLX versus EGL.
glamor: Drop useless glEnable/glDisable(GL_TEXTURE_2D) calls.
glamor: Drop fixed function transformation matrix setup.
glamor: yInverted is a boolean value, so use the Bool type.
glamor: Drop a bunch of GLES2 ifdefs.
glamor: Add a screen argument to drop an ifdef from glamor_set_alu().
glamor: Pass pixmaps around to unifdef glamor_iformat_for_depth().
glamor: Unifdef the cache format indices.
glamor: Move glamor_get_tex_format_type_from_pictformat to a .c file.
glamor: Unifdef the picture-format-to-format-and-type functions.
glamor: Move shader precision stuff from build time to shader compile time.
glamor: Fix typo in setting v_position's attrib location.
glamor: Don't bother keeping references to shader stages for gradients.
glamor: Fix linking of the gradient shaders on GLES2.
glamor: Move the EGL DRI3 code to GLAMOR_HAS_GBM.
configure.ac | 2 +-
glamor/Makefile.am | 5 +-
glamor/glamor.c | 74 +++---
glamor/glamor.h | 7 +-
glamor/glamor_context.h | 56 ++++
glamor/glamor_copyarea.c | 138 ++++------
glamor/glamor_core.c | 130 +++++-----
glamor/glamor_egl.c | 184 ++++++-------
glamor/glamor_egl_stubs.c | 12 +-
glamor/glamor_fbo.c | 53 ++--
glamor/glamor_fill.c | 83 +++---
glamor/glamor_gl_dispatch.c | 118 ---------
glamor/glamor_gl_dispatch.h | 128 ---------
glamor/glamor_glext.h | 63 -----
glamor/glamor_glx.c | 82 ++++++
glamor/glamor_glyphs.c | 8 +-
glamor/glamor_gradient.c | 619 ++++++++++++++++++--------------------------
glamor/glamor_picture.c | 3 +-
glamor/glamor_pixmap.c | 549 ++++++++++++++++++++++++++++++---------
glamor/glamor_priv.h | 48 ++--
glamor/glamor_putimage.c | 82 +++---
glamor/glamor_render.c | 319 ++++++++++-------------
glamor/glamor_tile.c | 103 ++++----
glamor/glamor_trapezoid.c | 213 +++++++--------
glamor/glamor_utils.h | 373 ++------------------------
glamor/glamor_xv.c | 146 +++++------
26 files changed, 1525 insertions(+), 2073 deletions(-)
create mode 100644 glamor/glamor_context.h
delete mode 100644 glamor/glamor_gl_dispatch.c
delete mode 100644 glamor/glamor_gl_dispatch.h
delete mode 100644 glamor/glamor_glext.h
create mode 100644 glamor/glamor_glx.c
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140214/c2ebca88/attachment.pgp>
More information about the xorg-devel
mailing list