[PULL] glamor cleanups and VBO changes (and glx fix)
Eric Anholt
eric at anholt.net
Mon Mar 10 13:34:53 PDT 2014
keithp said he was comfortable with the level of review on these, so
here goes. I dropped the two changes from the two series that didn't
get review comments: glViewport() in ephyr, and dropping
glXMakeCurrent(None).
The following changes since commit 7f15e5aed79803fa6057fbfda7dfbacacc2e019d:
Require video drivers to report that they support server managed fds (2014-03-10 09:08:46 +0100)
are available in the git repository at:
git://people.freedesktop.org/~anholt/xserver glamor-pull-request
for you to fetch changes up to 6e5ea5487738cbca9d585d24e66eb65b93ad579c:
glx: Clear new FBConfig attributes to 0 by default. (2014-03-10 13:31:14 -0700)
----------------------------------------------------------------
Eric Anholt (14):
glamor: remove dead global variable.
glamor: Fix a spelling mistake in GLAMOR_PIXMAP_FBO_NOT_EXACT_SIZE.
glamor: Add a note about the state of GL_ARB_map_buffer_range.
dix: Remove incorrect comment about privates.
glamor: Fix a mismatched glamor_get/put_context().
glamor: Don't forget to set GL_INVALIDATE_RANGE_BIT on GL_ARB_mbr.
glamor: Move glamor_emit_composite_vert() to traps, where it's used.
glamor: Track the next vertex offset as we go in render accel.
glamor: Track the next vertex offset as we go for non-AA traps.
glamor: Track the next vertex offset as we go for AA traps.
glamor: Extract the streamed vertex data code used by Render.
glamor: Fix requested composite VBO size.
glamor: Use buffer_storage
glx: Clear new FBConfig attributes to 0 by default.
dix/privates.c | 9 +--
glamor/Makefile.am | 1 +
glamor/glamor.c | 17 +++++
glamor/glamor.h | 1 +
glamor/glamor_gradient.c | 5 --
glamor/glamor_pixmap.c | 3 +-
glamor/glamor_priv.h | 25 +++++--
glamor/glamor_render.c | 108 +++++----------------------
glamor/glamor_trapezoid.c | 128 ++++++++++++++++---------------
glamor/glamor_utils.h | 2 +-
glamor/glamor_vbo.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++
glx/glxdricommon.c | 2 +-
12 files changed, 314 insertions(+), 173 deletions(-)
create mode 100644 glamor/glamor_vbo.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/20140310/af542517/attachment.pgp>
More information about the xorg-devel
mailing list