Skip to contentSkip to conversation

glamor 0.5.0

ANNOUNCE Zhigang Gong 6 participants 10 messages Aug 10, 2012 – Aug 21, 2012

lore
Share & tools
lore
#0 lore raw

After three moths development, I’m pleased to release glamor version 0.5.0. The major improvements

are as below:

1. Support tiling large pixmap to multiple small textures.

2. Enable gradient shader.

3. Optimize glyphs rendering performance

4. Implement first shader to generate trapezoids.

Cairo-demo’s spinner on a large picture(12000x12000) get about 10x improvement, and gradient also

get about 2x improvement. Aa10text and rgb10text also get about 2x improvement.

Thanks for Junyan and Michel’s contribution.

Glamor has a restriction with latest xserver. The main issue is that glamor rely on the module loading

sequence which is not guaranteed by current xserver. We will fix this issue in next version. If you want

to try a full functional xserver with glamor, it’s recommended to use the following xserver version:

commit a615b90cab7569fae9d123e4da1d3373c871d84b

Author: Keith Packard <[email protected]>

Date: Wed Mar 14 11:32:36 2012 -0700

Bump version number to 1.12.99.0

Now that 1.12 has branched, reset the version on master to a

development number.

We have the following work items for next release:

1. Fix the coexisting problem with glx for latest xserver. Don’t rely
on the module loading sequence.

2. Continue performance tuning:

a) Implement delay flushing mechanism to avoid tiny drawing
operation for each DrawElements/DrawArrays call.

b) Implement atlas for small pixmap.

c) Optimize trapezoid shader to reduce the overhead for those
non-edge pixels.

d) Optimize trapezoid/gradient shader to merge the mask/source
creation and compositing into one shader.

e) Optimize glamor itself’ overhead.

3. Xv support.

The following changes since commit d5cdad0497ae5f6cd936a74f68169c0910ea1e68:

Release 0.4. (2012-04-28 17:02:35 +0800)

are available in the git repository at:

git://anongit.freedesktop.org/xorg/driver/glamor

tag v0.5

tar ball is at:

http://cgit.freedesktop.org/xorg/driver/glamor/snapshot/glamor-0.5.tar.gz

Please refer the following wiki page for how to try glamor with Intel driver.

http://www.freedesktop.org/wiki/Software/Glamor

for you to fetch changes up to 9b8a791290af0add84269efdb315f9f58798f6d2:

Bump to version 0.5. (2012-08-10 13:46:42 +0800)

----------------------------------------------------------------

Junyan He (14):

Extract the gradient related code out.

Fix a bugy macro definition.

Fix the problem of set the same stop several times.

Fix the problem of vertical and horizontal case error in linear
gradient.

Fix the problem of x_source and y_source causing radial error

Add macro of vertex setting for triangle stripe

Modilfy the composite logic to two phases

Add the trapezoid direct render logic

Use the direct render path for A1

Fix a bug for trapezoid clip

Change the trapezoid render to use VBO.

Just use the shader to generate trapezoid if PolyMode == Imprecise

Fix the problem of VBO leak.

Fallback to pixman when trapezoid mask is big.

Michel Dänzer (4):

Fix translation of clip region for composite fallback.

Stream vertex data to VBOs.

Print space between name of missing EGL extension and 'required'.

Prefer KHR_surfaceless_context EGL extension over
KHR_surfaceless_opengl/gles2.

RobinHe (2):

Create the file glamor_triangles.c

Use shader to generate the temp trapezoid mask

Zhigang Gong (43):

We should not call gradient finalization code if we disable it.

Added strict warning flags to CFLAGS.

Remove the texture cache code.

glamor_set_destination_pixmap_priv_nc: set drawable's width x height.

glamor_largepixmap: first commit for large pixmap.

largepixmap: Implement infrastructure for large pixmap.

largepixmap: Enable glamor_composite.

glamor_putimage: Correct the wrong stride value.

glamor_getimage: should call miGetimage if failed to get sub-image.

largepixmap: Add transform/repeat/reflect/pad support.

largepixmap: Support self composite for large pixmap.

largepixmap: Fix the selfcopy issue.

Enable large pixmap by default.

trapezoid: Fallback to sw-rasterize for largepixmap.

copyarea: Cleanup the error handling logic.

glamor_glyphs: Before get upload to cache flush is needed.

glamor_emit_composite_vert: Optimize to don't do two times vert
coping.

gles2_largepixmap: force clip for a non-large pixmap.

glamor_fbo: fix a memory leak for large pixmap.

glamor_create_pixmap: Allocate glyphs pixmap in memory.

glamor_render: Don't fallback when rendering glyphs with OpOver.

glamor_glyphs: Detect fake or real glyphs overlap.

glamor_composite_glyph: Optimize glyphs with non-solid pattern.

glamor_render: Optimize the two pass ca rendering.

glamor_largepixmap: Walkaround for large texture's upload.

glamor_render: Don't allocate buffer for vbo each time.

glamor_glyphs: Slightly performance tuning.

glamor_copyarea: Fixed a bug introduced by 996194...

create_pixmap: use texture for large glyphs.

optimize: Use likely and unlikely.

glamor_compositerects: Implement optimized version.

glamor_glyphs: Use cache picture to store mask picture if possible.

glamor_copyarea: Use blitcopy if current state is not render.

glamor_glyphs: Don't merge extents for different lists.

gles2: Fixed the compilation problem and some bugs.

Synch with xorg 1.13 change.

Added the missed header file for xorg 1.13 compat.

glamor_trapezoid: workaround a glsl like problem.

glamor_glyphs: When dst arg point to a NULL buffer, dont't flush.

glamor_largepixmap: Fixed a bug in repeat clipping.

Silence compilation warnings.

Increase vbo size to 64K verts.

Bump to version 0.5.

configure.ac | 2 +-

src/Makefile.am | 6 +-

src/compat-api.h | 107 ++

src/compiler.h | 59 +

src/glamor.c | 98 +-

src/glamor.h | 16 +-

src/glamor_compositerects.c | 278 +++++

src/glamor_copyarea.c | 356 ++++--

src/glamor_copyplane.c | 3 -

src/glamor_core.c | 26 +-

src/glamor_debug.h | 4 +-

src/glamor_egl.c | 61 +-

src/glamor_eglmodule.c | 4 +-

src/glamor_fbo.c | 274 ++--

src/glamor_fill.c | 173 ++-

src/glamor_fillspans.c | 3 -

src/glamor_getimage.c | 4 +-

src/glamor_glext.h | 3 +

src/glamor_glyphs.c | 1452 +++++++++++++++++----

src/glamor_gradient.c | 1584 +++++++++++++++++++++++

src/glamor_largepixmap.c | 1324 ++++++++++++++++++++

src/glamor_picture.c | 16 +-

src/glamor_pixmap.c | 441 +++++--

src/glamor_polyfillrect.c | 3 -

src/glamor_polylines.c | 2 -

src/glamor_priv.h | 363 +++++-

src/glamor_putimage.c | 8 +-

src/glamor_render.c | 2912
+++++++++++--------------------------------

src/glamor_tile.c | 202 ++-

src/glamor_trapezoid.c | 1810 +++++++++++++++++++++++++++

src/glamor_utils.h | 841 +++++++++++--

src/glapi.h | 6 +-

32 files changed, 9338 insertions(+), 3103 deletions(-) 

create mode 100644 src/compat-api.h

create mode 100644 src/compiler.h

create mode 100644 src/glamor_compositerects.c

create mode 100644 src/glamor_gradient.c

create mode 100644 src/glamor_largepixmap.c

create mode 100644 src/glamor_trapezoid.c

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#1 lore raw
Quoted 11 lines · Zhigang Gong

to try a full functional xserver with glamor, it’s recommended to use the following xserver version:

commit a615b90cab7569fae9d123e4da1d3373c871d84b

Author: Keith Packard <[email protected]>

Date: Wed Mar 14 11:32:36 2012 -0700

Quoted 8 lines

Bump version number to 1.12.99.0

Now that 1.12 has branched, reset the version on master to a

development number.

Why is such an old server version recommended? Surely tip of server-1.12-branch is superior to this branch point+1 on master? And I'd really expect tip of master to be a better candidate than that given the development nature of glamor. Can you please clarify?

Thanks,
Jeremy

_______________________________________________
[email protected]: X.Org support
Archives: http://lists.freedesktop.org/archives/xorg
Info: http://lists.x.org/mailman/listinfo/xorg
Your subscription address: [email protected]

#2 lore raw
Quoted 18 lines · Jeremy Huddleston Sequoia
Quoted 15 lines · Zhigang Gong

to try a full functional xserver with glamor, it’s recommended to use the following xserver version:

commit a615b90cab7569fae9d123e4da1d3373c871d84b

Author: Keith Packard <[email protected]>

Date: Wed Mar 14 11:32:36 2012 -0700

   Bump version number to 1.12.99.0
Quoted 7 lines
Quoted 4 lines

Now that 1.12 has branched, reset the version on master to a

development number.

Why is such an old server version recommended? Surely tip of server-1.12-branch is superior to this branch point+1 on master? And I'd really expect tip of master to be a better candidate than that given the development nature of glamor. Can you please clarify?

That should be fine. The commit is question is just the most recent commit on master that still works prior to the changes that broke the module ordering that broke glamor.

Alex
_______________________________________________
[email protected]: X.Org support
Archives: http://lists.freedesktop.org/archives/xorg
Info: http://lists.x.org/mailman/listinfo/xorg
Your subscription address: [email protected]

#3 lore raw
Quoted 26 lines · Alex Deucher
Quoted 24 lines · Jeremy Huddleston Sequoia
Quoted 19 lines · Zhigang Gong

to try a full functional xserver with glamor, it’s recommended to use the following xserver version:

commit a615b90cab7569fae9d123e4da1d3373c871d84b

Author: Keith Packard <[email protected]>

Date: Wed Mar 14 11:32:36 2012 -0700

Bump version number to 1.12.99.0

Now that 1.12 has branched, reset the version on master to a

development number.

Quoted 5 lines
Quoted 1 line

Why is such an old server version recommended? Surely tip of server-1.12-branch is superior to this branch point+1 on master? And I'd really expect tip of master to be a better candidate than that given the development nature of glamor. Can you please clarify?

That should be fine. The commit is question is just the most recent commit on master that still works prior to the changes that broke the module ordering that broke glamor.

I think you're mistaken. The commit referenced is just xorg-server-1.12.0 + version change. It is significantly before the module loading changes.
_______________________________________________
[email protected]: X.Org support
Archives: http://lists.freedesktop.org/archives/xorg
Info: http://lists.x.org/mailman/listinfo/xorg
Your subscription address: [email protected]

#4 lore raw
Quoted 29 lines · Jeremy Huddleston Sequoia
Quoted 26 lines · Alex Deucher
Quoted 24 lines · Jeremy Huddleston Sequoia
Quoted 19 lines · Zhigang Gong

to try a full functional xserver with glamor, it’s recommended to use the following xserver version:

commit a615b90cab7569fae9d123e4da1d3373c871d84b

Author: Keith Packard <[email protected]>

Date: Wed Mar 14 11:32:36 2012 -0700

Bump version number to 1.12.99.0

Now that 1.12 has branched, reset the version on master to a

development number.

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Why is such an old server version recommended? Surely tip of server-1.12-branch is superior to this branch point+1 on master? And I'd really expect tip of master to be a better candidate than that given the development nature of glamor. Can you please clarify?

That should be fine. The commit is question is just the most recent commit on master that still works prior to the changes that broke the module ordering that broke glamor.

I think you're mistaken. The commit referenced is just xorg-server-1.12.0 + version change. It is significantly before the module loading changes.

That was just an uneducated guess on my part. Glamor does work on older xservers... I'll shut up now.

Alex
_______________________________________________
[email protected]: X.Org support
Archives: http://lists.freedesktop.org/archives/xorg
Info: http://lists.x.org/mailman/listinfo/xorg
Your subscription address: [email protected]

#5 lore raw
In reply to Jeremy Huddleston Sequoia
Quoted 18 lines · Jeremy Huddleston Sequoia
Quoted 15 lines · Zhigang Gong

to try a full functional xserver with glamor, it’s recommended to use the following xserver version:

commit a615b90cab7569fae9d123e4da1d3373c871d84b

Author: Keith Packard <[email protected]>

Date: Wed Mar 14 11:32:36 2012 -0700

   Bump version number to 1.12.99.0
Quoted 7 lines
Quoted 4 lines

Now that 1.12 has branched, reset the version on master to a

development number.

Why is such an old server version recommended? Surely tip of server-1.12-branch is superior to this branch point+1 on master? And I'd really expect tip of master to be a better candidate than that given the development nature of glamor. Can you please clarify?

This version is what I'm used to do the last round testing, so I recommended it in the announcement. Actually, glamor 0.5.0 is also compatible with the tip of server-1.12-branch. I just not do fully testing with it but it should work fine.

As to the master branch, glamor 0.5.0 is not compatible with it since the following commit:

a1d41e...: Move extension initialisation prototypes into extinit.

The last compatible version is at commit b86aa74...

As to the reason why glamor can't work with tip ot master, please refer:
http://lists.x.org/archives/xorg-devel/2012-July/032597.html.

BTW, to fix that issue is the first to do item for next version glamor.

Thanks,
Zhigang

Quoted 4 lines

Thanks,
Jeremy

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw

Re: Netiquette: No HTML messages please. (was: [ANNOUNCE] glamor 0.5.0)

In reply to Paul Menzel
Quoted 5 lines · Paul Menzel

Dear Zhigang,

thank you for the announcement message and congratulations on the release. But please do not send HTML messages to lists [1]!

Thanks for pointing this out. Actually, I was not aware of that I sent any non plain-text messages. The email client did some auto formating for me :(. I will check the message more carefully next time.

Thanks,
Zhigang

Quoted 8 lines

Thanks,

Paul

[1] http://en.opensuse.org/openSUSE:Mailing_list_netiquette

_______________________________________________
[email protected]: X.Org support
Archives: http://lists.freedesktop.org/archives/xorg
Info: http://lists.x.org/mailman/listinfo/xorg
Your subscription address: [email protected]

#8 lore raw
In reply to Zhigang Gong

Hi Zhigang,

Quoted 3 lines · Zhigang Gong

tar ball is at:

http://cgit.freedesktop.org/xorg/driver/glamor/snapshot/glamor-0.5.tar.gz

This is a git snapshot, not a tarball made using automake's "make dist" like all X.org modules use.

Is one planned?

Cheers,

Rémi

_______________________________________________
[email protected]: X.Org support
Archives: http://lists.freedesktop.org/archives/xorg
Info: http://lists.x.org/mailman/listinfo/xorg
Your subscription address: [email protected]

#9 lore raw
Quoted 9 lines · Rémi Cardona

Hi Zhigang,

Quoted 3 lines · Zhigang Gong

tar ball is at:

http://cgit.freedesktop.org/xorg/driver/glamor/snapshot/glamor-0.5.tar.gz

This is a git snapshot, not a tarball made using automake's "make dist" like all X.org modules use.

I forgot to make and upload the tarballs. Thanks for your reminder.

Quoted 2 lines

Is one planned?

sure, here you are.

git tag: glamor-egl-0.5.0

http://xorg.freedesktop.org/archive/individual/driver/glamor-egl-0.5.0.tar.bz2
MD5: 7dc2b4e0d8d286531c433893945a3837 glamor-egl-0.5.0.tar.bz2
SHA1: 6495d1a2054e2a8e0f7e01bc7e3345cd50d21972 glamor-egl-0.5.0.tar.bz2
SHA256: 5dc8679ccb3e42bf431b6316c7907b9df2db89745d523e04721f34aee6c84991
glamor-egl-0.5.0.tar.bz2

http://xorg.freedesktop.org/archive/individual/driver/glamor-egl-0.5.0.tar.gz
MD5: 8f8f58cbf661a6eb70785864ebf5153f glamor-egl-0.5.0.tar.gz
SHA1: 08366dd52b5f5812847f20a1252a86100766f8ab glamor-egl-0.5.0.tar.gz
SHA256: e7ed6ead72a44bcd68d837eb5bf133f760be1e5fb42907cf1bb06ba5f4d6dc18
glamor-egl-0.5.0.tar.gz

Quoted 10 lines

Cheers,

Rémi

_______________________________________________
[email protected]: X.Org support
Archives: http://lists.freedesktop.org/archives/xorg
Info: http://lists.x.org/mailman/listinfo/xorg
Your subscription address: [email protected]