[PATCH v5 11/11] Rename gles2-renderer to gl-renderer.

2012-11-09 Thread John Kåre Alsaker
--- src/compositor-android.c | 22 +++--- src/compositor-drm.c | 28 src/compositor-rpi.c | 28 src/compositor-wayland.c | 26 +++ src/compositor-x11.c | 18 ++--- src/gl-renderer.h| 28 src/gles2-renderer.c | 179 +++

[PATCH v5 10/11] Move EGL and GL includes to a gles2-renderer header.

2012-11-09 Thread John Kåre Alsaker
--- src/Makefile.am | 1 + src/compositor-android.c | 2 +- src/compositor-drm.c | 1 + src/compositor-rpi.c | 1 + src/compositor-wayland.c | 4 +--- src/compositor-x11.c | 4 +--- src/compositor.h | 33 -- src/gl-renderer.h|

[PATCH v5 09/11] Move weston_compositor GL and EGL state into gles2-renderer.

2012-11-09 Thread John Kåre Alsaker
--- src/compositor.h | 14 --- src/gles2-renderer.c | 67 ++-- 2 files changed, 39 insertions(+), 42 deletions(-) diff --git a/src/compositor.h b/src/compositor.h index c7fc36b..a5a7b59 100644 --- a/src/compositor.h +++ b/src/compositor.

[PATCH v5 08/11] Move weston_surface GL and EGL state into gles2-renderer.

2012-11-09 Thread John Kåre Alsaker
--- src/compositor.c | 2 -- src/compositor.h | 6 src/gles2-renderer.c | 87 +--- 3 files changed, 48 insertions(+), 47 deletions(-) diff --git a/src/compositor.c b/src/compositor.c index bd95e8c..587fded 100644 --- a/src/compositor.

[PATCH v5 07/11] Moved shader state into gles2-renderer.

2012-11-09 Thread John Kåre Alsaker
--- src/compositor.h | 18 src/gles2-renderer.c | 116 +++ 2 files changed, 71 insertions(+), 63 deletions(-) diff --git a/src/compositor.h b/src/compositor.h index 35b64f2..691af04 100644 --- a/src/compositor.h +++ b/src/compositor.h

[PATCH v5 06/11] gles2-renderer: Renaming some functions.

2012-11-09 Thread John Kåre Alsaker
--- src/gles2-renderer.c | 53 ++-- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/src/gles2-renderer.c b/src/gles2-renderer.c index f37249e..1b5a20c 100644 --- a/src/gles2-renderer.c +++ b/src/gles2-renderer.c @@ -642,7 +642,7 @@ us

[PATCH v5 05/11] compositor: Add a function to set surface color in weston_renderer and move color state to gles2-renderer.

2012-11-09 Thread John Kåre Alsaker
--- src/compositor.c | 11 ++- src/compositor.h | 7 ++- src/gles2-renderer.c | 47 ++- src/noop-renderer.c | 14 ++ 4 files changed, 72 insertions(+), 7 deletions(-) diff --git a/src/compositor.c b/src/compositor.c ind

[PATCH v5 04/11] compositor: Add a renderer function to read out pixels and remove the GL calls from screenshooter.

2012-11-09 Thread John Kåre Alsaker
--- src/compositor.h | 6 - src/gles2-renderer.c | 67 +++- src/noop-renderer.c | 10 src/screenshooter.c | 27 +++-- 4 files changed, 86 insertions(+), 24 deletions(-) diff --git a/src/compositor.h b/src/composit

[PATCH v5 03/11] Move compositor-wayland border drawing into gles2-renderer.

2012-11-09 Thread John Kåre Alsaker
--- src/compositor-wayland.c | 160 +++- src/compositor.h | 3 + src/gles2-renderer.c | 171 +++ 3 files changed, 182 insertions(+), 152 deletions(-) diff --git a/src/compositor-wayland.c b/src/compo

[PATCH v5 02/11] Move EGLConfig, EGLContext and EGLDisplay fields into gles2-renderer.

2012-11-09 Thread John Kåre Alsaker
--- src/compositor-android.c | 150 +++ src/compositor-drm.c | 39 ++--- src/compositor-rpi.c | 80 --- src/compositor-wayland.c | 48 +++ src/compositor-x11.c | 58 ++ src/compositor.h | 11 ++- src/g

[PATCH v5 01/11] Move weston_output EGL state into gles2-renderer.

2012-11-09 Thread John Kåre Alsaker
--- src/compositor-android.c | 21 ++-- src/compositor-drm.c | 52 ++ src/compositor-rpi.c | 43 ++--- src/compositor-wayland.c | 21 ++-- src/compositor-x11.c | 18 --- src/compositor.h | 18 +-- s

Re: [PATCH 3/2 weston] clickdot: Add --debug option to preserve useful behavior.

2012-11-09 Thread Bill Spitzak
Make a new "draw" program. Nobody is going to discover the "debug" command line option. I certainly use clickdot as it is to see how fast event responses are. It would be nice to fix it to draw all the received mouse-move events, rather than drawing straight lines between where the mouse was o

Re: [PATCH] Add version info to the shared libs

2012-11-09 Thread Mikko Levonmaa
Right, so if the first api version is 0 then it make sense, sort of, matter of preference I guess. So, the original patch was wrong, however the new suggestion was actually geared towards the future and the next release(s), so if I'm not mistaken that needs to be done through the -version-info and

Re: [PATCH] Add version info to the shared libs

2012-11-09 Thread David Herrmann
Hi On Fri, Nov 9, 2012 at 6:17 PM, Mikko Levonmaa wrote: > Yes, true. Still to me having a meaningful version number in the actual > library files does provide value. > > Also the manual does suggest that a -version-info is provided if we want to > use libtool's versioning system, > albeit they d

Re: [PATCH] Add version info to the shared libs

2012-11-09 Thread Mikko Levonmaa
Yes, true. Still to me having a meaningful version number in the actual library files does provide value. Also the manual does suggest that a -version-info is provided if we want to use libtool's versioning system, albeit they discourage the direct relation to the actual package version name. htt

Re: [PATCH weston 4/4] compositor-drm: Use drm_fbs for the sprite code too

2012-11-09 Thread Kristian Høgsberg
On Fri, Nov 09, 2012 at 02:19:05PM +0200, Ander Conselvan de Oliveira wrote: > This makes drm_fb_get_from_bo() use drmModeAddFB2() if possible so that > drm_output_prepare_overlay_surface() can use this instead of keeping > track of the fbs and buffers itself. Yea, that looks very good. I removed

Re: [PATCH weston 3/4] compositor-drm: Don't schedule repaint on scanout buffer destroy handler

2012-11-09 Thread Kristian Høgsberg
On Fri, Nov 09, 2012 at 02:19:04PM +0200, Ander Conselvan de Oliveira wrote: > Let the compositor generic code decide what to do when the buffer goes > away. We still have a valid reference do the bo, so we can still show > the client contents until something else triggers a repaint. > --- > src/c

Re: 1.0 Branch created

2012-11-09 Thread Thiago Macieira
On sexta-feira, 9 de novembro de 2012 10.37.06, Kristian Høgsberg wrote: > I've created 1.0 branches in the wayland and weston repos. I found it > confusing the use the 'master' and 'next' terminology when replying to > patch emails and being able to just say 'commited to 1.0' is a lot > clearer t

1.0 Branch created

2012-11-09 Thread Kristian Høgsberg
I've created 1.0 branches in the wayland and weston repos. I found it confusing the use the 'master' and 'next' terminology when replying to patch emails and being able to just say 'commited to 1.0' is a lot clearer than saying 'committed to master' and then wonder whether 'master' is the feature

Re: [PATCH 3/2 weston] clickdot: Add --debug option to preserve useful behavior.

2012-11-09 Thread Pekka Paalanen
On Fri, 9 Nov 2012 07:53:32 -0700 Scott Moreau wrote: > On Fri, Nov 9, 2012 at 2:46 AM, Pekka Paalanen wrote: > > > On Fri, 9 Nov 2012 02:20:33 -0700 > > Scott Moreau wrote: > > > > > --- > > > > > > Hi Pekka, > > > > > > Thanks for the review. Here is a patch that could be applied on top to

Re: [PATCH 3/2 weston] clickdot: Add --debug option to preserve useful behavior.

2012-11-09 Thread Scott Moreau
On Fri, Nov 9, 2012 at 2:46 AM, Pekka Paalanen wrote: > On Fri, 9 Nov 2012 02:20:33 -0700 > Scott Moreau wrote: > > > --- > > > > Hi Pekka, > > > > Thanks for the review. Here is a patch that could be applied on top to > > preserve the original behavior. > > Hello Scott, > > ok, then you should

[PATCH weston 4/4] compositor-drm: Use drm_fbs for the sprite code too

2012-11-09 Thread Ander Conselvan de Oliveira
This makes drm_fb_get_from_bo() use drmModeAddFB2() if possible so that drm_output_prepare_overlay_surface() can use this instead of keeping track of the fbs and buffers itself. --- src/compositor-drm.c | 215 +- 1 file changed, 88 insertions(+), 12

[PATCH weston 2/4] compositor-drm: Only request vblank events if needed

2012-11-09 Thread Ander Conselvan de Oliveira
If the sprite is disabled and we're not enabling it on the next frame, nothing is done in the vblank handler, so there's no need to ask for a vblank event. --- src/compositor-drm.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compositor-drm.c b/src/compositor-drm.c

[PATCH weston 3/4] compositor-drm: Don't schedule repaint on scanout buffer destroy handler

2012-11-09 Thread Ander Conselvan de Oliveira
Let the compositor generic code decide what to do when the buffer goes away. We still have a valid reference do the bo, so we can still show the client contents until something else triggers a repaint. --- src/compositor-drm.c | 11 +++ 1 file changed, 3 insertions(+), 8 deletions(-) di

[PATCH weston 1/4] compositor-drm: Remove drm_disable_unused_sprites()

2012-11-09 Thread Ander Conselvan de Oliveira
If a sprite is no longer used, it is disabled on the call to drmModeSetPlane() when doing the output repaint, since its pending_fb_id is 0. --- src/compositor-drm.c | 36 1 file changed, 36 deletions(-) diff --git a/src/compositor-drm.c b/src/compositor-drm.

Re: [PATCH 3/2 weston] clickdot: Add --debug option to preserve useful behavior.

2012-11-09 Thread Pekka Paalanen
On Fri, 9 Nov 2012 02:20:33 -0700 Scott Moreau wrote: > --- > > Hi Pekka, > > Thanks for the review. Here is a patch that could be applied on top to > preserve the original behavior. Hello Scott, ok, then you should probably make the debug mode the default, but what is the purpose of the non

[PATCH 3/2 weston] clickdot: Add --debug option to preserve useful behavior.

2012-11-09 Thread Scott Moreau
--- Hi Pekka, Thanks for the review. Here is a patch that could be applied on top to preserve the original behavior. clients/clickdot.c | 26 +- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/clients/clickdot.c b/clients/clickdot.c index b04db6b..9e3def0

Re: [PATCH 2/2 weston] clickdot: Only draw line on click.

2012-11-09 Thread Pekka Paalanen
On Fri, 9 Nov 2012 01:11:34 -0700 Scott Moreau wrote: > --- > clients/clickdot.c | 16 ++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/clients/clickdot.c b/clients/clickdot.c > index 7358656..b04db6b 100644 > --- a/clients/clickdot.c > +++ b/clients/clickdo

[PATCH 2/2 weston] clickdot: Only draw line on click.

2012-11-09 Thread Scott Moreau
--- clients/clickdot.c | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/clients/clickdot.c b/clients/clickdot.c index 7358656..b04db6b 100644 --- a/clients/clickdot.c +++ b/clients/clickdot.c @@ -52,7 +52,7 @@ struct clickdot { int32_t old_x, ol

[PATCH 1/2 weston] clickdot: Reposition dot on resize.

2012-11-09 Thread Scott Moreau
Attempt to keep dot in the same position proportionate to the surface's size. --- clients/clickdot.c | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/clients/clickdot.c b/clients/clickdot.c index c74bc91..7358656 100644 --- a/clients/clickdot.c +++ b/clients/c

[PATCH 3/3 weston] Implement optional resize-from-center mode.

2012-11-09 Thread Scott Moreau
--- clients/window.c | 15 ++- src/shell.c | 40 +++- weston.ini | 1 + 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/clients/window.c b/clients/window.c index 9a11571..6468e85 100644 --- a/clients/window.c +++ b/client

[PATCH 2/3 wayland] protocol: Add documentation for resize enum.

2012-11-09 Thread Scott Moreau
--- protocol/wayland.xml | 12 1 file changed, 12 insertions(+) diff --git a/protocol/wayland.xml b/protocol/wayland.xml index 25fc3ae..f22a207 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -542,6 +542,18 @@ + + Used to determine the resize

[PATCH 1/3 wayland] protocol: Add resize from center flag.

2012-11-09 Thread Scott Moreau
--- protocol/wayland.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/protocol/wayland.xml b/protocol/wayland.xml index 4205dae..25fc3ae 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -551,6 +551,7 @@ + -- 1.7.11.7 _