Re: [PULL] glamor cleanups and VBO changes (and glx fix)

2014-03-10 Thread Keith Packard
Eric Anholt  writes:

> 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.

Merged (except for the incorrect dix change)
   7f15e5a..96a28e9  master -> master

-- 
keith.pack...@intel.com


pgpOh7cN8IHII.pgp
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

Re: [PULL] glamor cleanups and VBO changes (and glx fix)

2014-03-10 Thread Eric Anholt
Eric Anholt  writes:

> 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:

keithp pointed out that he had a problem with the dix comment change,
which I'd missed in processing review.  I've updated to drop the commit,
with a new sha1 for the pull of 96a28e9c914d7ae9b269f73a27b99cbd3c465ac8.


pgpibKNcA07gm.pgp
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

[PULL] glamor cleanups and VBO changes (and glx fix)

2014-03-10 Thread Eric Anholt
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


pgpPDOBx3qzSe.pgp
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