[Glamor] [PATCH 00/34] Ports from Eric's xserver tree to standalone glamor

[Alex Deucher]

On Thu, Mar 13, 2014 at 11:30 AM, Zhigang Gong <zhigang.gong at gmail.com> wrote:
> On Thu, Mar 13, 2014 at 10:14 PM, Markus Wick <markus at selfnet.de> wrote:
>> Hi,
>>
>> This list seem to have included some broken commits Eric has stripped out in
>> the xserver repo.
>> I'd suggest to only to merge the patches accepted / reviewed in the xserver
>> repo.
>
> Good suggestion, but too late, I just pushed the whole series :(.
> Although it seems
> that everything work fine so far.
> Could you or Alex can help to point out which commits are broken in this series?

I haven't looked at Eric's latest patches too closely yet, but we
didn't see any regression with this patch series.

Alex

> Thanks.
>
>>
>> Am 2014-03-13 15:08, schrieb gongzg:
>>
>>> Hi,
>>>
>>> The whole series LGTM. I will push it latter. Thanks.
>>>
>>> On Fri, Feb 28, 2014 at 01:01:55PM -0500, Alex Deucher wrote:
>>>>
>>>> This patch set is a port of the recent improvements in Eric's
>>>> xserver tree to standalone glamor.  You can also find the patches
>>>> here for review:
>>>> http://cgit.freedesktop.org/~agd5f/glamor/log/?h=eric-xserver2
>>>>
>>>> These are lightly tested but seem to work fine.  Some nice performance
>>>> improvements, notably x11perf -range ftext,tr24itext' which tests
>>>> server side fonts used by legacy apps.
>>>>
>>>> Eric Anholt (34):
>>>>   glamor: Fix a spelling mistake in GLAMOR_PIXMAP_FBO_NOT_EXACT_SIZE.
>>>>   glamor: Drop fixed function transformation matrix setup.
>>>>   glamor: Drop useless glEnable/glDisable(GL_TEXTURE_2D) calls.
>>>>   glamor: yInverted is a boolean value, so use the Bool type.
>>>>   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: Fix typo in setting v_position's attrib location.
>>>>   glamor: Don't bother keeping references to shader stages for
>>>>     gradients.
>>>>   glamor: Don't forget to set GL_INVALIDATE_RANGE_BIT on GL_ARB_mbr.
>>>>   glamor: Avoid generating GL errors when doing two-pass CA.
>>>>   glamor: Drop bogus _X_UNLIKELY.
>>>>   glamor: Fix some integer overflow errors.
>>>>   glamor: Rename a variable to be more descriptive.
>>>>   glamor: Rename more solid fill variables to clean up the code.
>>>>   glamor: Fix up doxygen for glamor_fill.c.
>>>>   glamor: Extract the streamed vertex data code used by Render. (v2)
>>>>   glamor: Replace some goofy enum-likes with a real enum.
>>>>   glamor: Drop unused GLAMOR_ACCESS_WO.
>>>>   glamor: Allow nested mapping of pixmaps.
>>>>   glamor: Rely on nested mappings to handle src==dst and !prepare bugs.
>>>>   glamor: Add missing prepares on the GC during fb fallbacks.
>>>>   glamor: Use streamed vertex data for solid fills.
>>>>   glamor: Use quads instead of index buffer on desktop.
>>>>   glamor: Improve the performance of PushPixels by, well, pushing
>>>>     pixels.
>>>>   glamor: Improve the performance of PolyGlyphBlt.
>>>>   glamor: Fix ignoring the ALU during SetSpans().
>>>>   glamor: Make sure we've put the context back to 0 periodically.
>>>>   glamor: Add am assert about an invariant the upload code relies on.
>>>>   glamor: Don't forget to unmap our PBOs before usng them to upload.
>>>>   glamor: Fix requested composite VBO size.
>>>>   glamor: Don't try to fallback sub-upload to an in-memory pixmap.
>>>>   glamor: Move shader precision stuff from build time to shader compile
>>>>     time.
>>>>
>>>>  src/Makefile.am           |   1 +
>>>>  src/glamor.c              |  16 +-
>>>>  src/glamor.h              |   1 +
>>>>  src/glamor_addtraps.c     |   2 +-
>>>>  src/glamor_copyarea.c     |  22 +--
>>>>  src/glamor_copyplane.c    |  15 +-
>>>>  src/glamor_core.c         |  40 +++--
>>>>  src/glamor_fbo.c          |   2 +-
>>>>  src/glamor_fill.c         |  88 ++++++-----
>>>>  src/glamor_fillspans.c    |  12 +-
>>>>  src/glamor_getspans.c     |   2 +-
>>>>  src/glamor_glyphblt.c     | 257 +++++++++++++++++++++++++++++++
>>>>  src/glamor_gradient.c     |  68 +-------
>>>>  src/glamor_picture.c      |   7 +-
>>>>  src/glamor_pixmap.c       | 346
>>>> +++++++++++++++++++++++++++++++++++++----
>>>>  src/glamor_polyfillrect.c |  11 +-
>>>>  src/glamor_polylines.c    |  11 +-
>>>>  src/glamor_priv.h         |  69 +++++----
>>>>  src/glamor_putimage.c     |   8 +-
>>>>  src/glamor_render.c       | 108 ++++---------
>>>>  src/glamor_setspans.c     |  12 +-
>>>>  src/glamor_tile.c         |   6 -
>>>>  src/glamor_trapezoid.c    |  74 +++------
>>>>  src/glamor_triangles.c    |  16 +-
>>>>  src/glamor_utils.h        | 385
>>>> ++++------------------------------------------
>>>>  src/glamor_vbo.c          |  98 ++++++++++++
>>>>  26 files changed, 943 insertions(+), 734 deletions(-)
>>>>  create mode 100644 src/glamor_vbo.c
>>>>
>>>> --
>>>> 1.8.3.1
>>>>
>>>> _______________________________________________
>>>> Glamor mailing list
>>>> Glamor at lists.freedesktop.org
>>>> http://lists.freedesktop.org/mailman/listinfo/glamor
>>>
>>> _______________________________________________
>>> Glamor mailing list
>>> Glamor at lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/glamor
> _______________________________________________
> Glamor mailing list
> Glamor at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/glamor