[PATCH] protocol: replace the usage of selection with clipboard

2014-03-12 Thread John Kåre Alsaker
0001-protocol-replace-the-usage-of-selection-with-clipboa.patch Description: Binary data ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel

Re: [PATCH] protocol: replace the usage of selection with clipboard

2014-03-13 Thread John Kåre Alsaker
On Wed, Mar 12, 2014 at 7:32 PM, Bill Spitzak spit...@gmail.com wrote: Isn't Wayland differentiating between the selection and the clipboard? It is not doing that at the moment. Only explicit clipboard actions are supposed to be used. The selection is changed when the user selects an

Re: [RFC PATCH 1/6] Add colorcorrection protocol

2014-04-03 Thread John Kåre Alsaker
On Thu, Apr 3, 2014 at 11:12 AM, Niels Ole Salscheider niels_...@salscheider-online.de wrote: Zoxc did not like the way I handle the uncorrected case because it is a bit ugly and breaks blending in the uncorrected area. Instead of using a mask to opt-out from color management, he suggests to

[PATCH] gl-renderer: Remove gl_renderer_interface from gl-renderer.h

2014-04-08 Thread John Kåre Alsaker
--- src/gl-renderer.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gl-renderer.h b/src/gl-renderer.h index db42f6c..6cd5f54 100644 --- a/src/gl-renderer.h +++ b/src/gl-renderer.h @@ -101,4 +101,3 @@ struct gl_renderer_interface { void (*print_egl_error_state)(void); };

Re: [PATCH] gl-renderer: Add flexible shader generation.

2014-04-08 Thread John Kåre Alsaker
support? Do you have new features lined up that rely on this? I always found that debugging generated shaders was fairly difficult and annoying, and while the old code isn't great, I find it's a lot simple to understand. On Tue, Apr 8, 2014 at 3:26 PM, John Kåre Alsaker john.kare.alsa

[PATCHv2 weston] gl-renderer: Remove gl_renderer_interface from gl-renderer.h

2014-04-10 Thread John Kåre Alsaker
The rationale here is, that this line would create an instance of gl_renderer_interface in every compilation unit that included gl-renderer.h. This is not necessary, and it can actually be harmful by masking the real exported gl_renderer_interface symbol, if you added another compilation unit to

Re: Deep Color support

2014-04-27 Thread John Kåre Alsaker
I implemented support for ABGR16161616 framebuffers in mesa/wl_drm. My patch has bit-rotted a bit now, but it gives you an idea about what to do: https://github.com/Zoxc/mesa/commit/73f39f1366287bab02c993cb3537980e89b3cdca My motivation for this was to have clients render with linear gamma. One

Re: Deep Color support

2014-04-27 Thread John Kåre Alsaker
On Sun, Apr 27, 2014 at 12:30 PM, Wolfgang Draxinger wdraxinger.maill...@draxit.de wrote: On Sun, 27 Apr 2014 12:11:39 +0200 John Kåre Alsaker john.kare.alsa...@gmail.com wrote: I implemented support for ABGR16161616 framebuffers in mesa/wl_drm. My patch has bit-rotted a bit now

Re: [PATCH mesa 4/7] Add the EGL_MESA_configless_context extension

2014-05-03 Thread John Kåre Alsaker
This commit results in garbage output for r600g when building with OpenGL (not ES) as enabled by my patches: https://github.com/Zoxc/weston/commits/gl-rebase. (--enable-opengl on configure) It works on i965 so I was wondering how well tested this is on Gallium drivers? On Fri, Mar 7, 2014 at

[PATCH v2 1/3] compositor: Add output callbacks for rendering backend.

2012-09-11 Thread John Kåre Alsaker
--- src/compositor.c | 12 src/compositor.h | 3 +++ src/gles2-renderer.c | 24 3 files changed, 39 insertions(+) diff --git a/src/compositor.c b/src/compositor.c index 911eaba..191ce9c 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -2523,6

[PATCH v2 3/3] compositor: Adds the ability to invert colors with Alt + I.

2012-09-11 Thread John Kåre Alsaker
--- src/compositor.h | 3 +++ src/gles2-renderer.c | 18 -- src/shell.c | 11 +++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/compositor.h b/src/compositor.h index 284c0ac..8305058 100644 --- a/src/compositor.h +++ b/src/compositor.h

[PATCH 0/9] Groundwork for moving EGL/GL state into gles2-renderer

2012-09-15 Thread John Kåre Alsaker
to set a surface to output a solid color. I'd like to hold off on moving all the EGL and GL state until these patches are merged and Kristian gives me a freeze on the gles2-renderer.c file since doing that would pretty much touch the entire file. John Kåre Alsaker (9): gles2-renderer: Provide

[PATCH 1/9] gles2-renderer: Provide an API for backends to use.

2012-09-15 Thread John Kåre Alsaker
--- src/compositor-android.c | 72 -- src/compositor-drm.c | 78 ++-- src/compositor-wayland.c | 58 -- src/compositor-x11.c | 71 +++--- src/compositor.h | 18 +- src/gles2-renderer.c | 151

[PATCH 2/9] gles2-renderer: Adds function to select the RGBA shader for the wayland backend.

2012-09-15 Thread John Kåre Alsaker
--- src/compositor-wayland.c | 9 + src/compositor.h | 2 ++ src/gles2-renderer.c | 14 ++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c index fce89a9..9a12b1d 100644 ---

[PATCH 3/9] compositor: Add a create_surface callback to weston_renderer.

2012-09-15 Thread John Kåre Alsaker
--- src/compositor.c | 5 + src/compositor.h | 1 + src/gles2-renderer.c | 7 +++ 3 files changed, 13 insertions(+) diff --git a/src/compositor.c b/src/compositor.c index 8c8dff0..2fb89b6 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -238,6 +238,11 @@

[PATCH 4/9] compositor: Add per output and per surface renderer state.

2012-09-15 Thread John Kåre Alsaker
--- src/compositor.h | 4 src/gles2-renderer.c | 44 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/src/compositor.h b/src/compositor.h index 9ad1753..3a9f4bc 100644 --- a/src/compositor.h +++ b/src/compositor.h @@ -149,6

[PATCH 5/9] compositor: Change API to better handle mode switches. Also moves EGLSurface into gles2-renderer.

2012-09-15 Thread John Kåre Alsaker
--- src/compositor-android.c | 2 +- src/compositor-drm.c | 19 +- src/compositor-wayland.c | 2 +- src/compositor-x11.c | 2 +- src/compositor.h | 13 ++-- src/gles2-renderer.c | 52 +--- 6 files changed,

[PATCH 6/9] gles2-renderer: Adds an utility function which calls eglMakeCurrent.

2012-09-15 Thread John Kåre Alsaker
--- src/gles2-renderer.c | 48 +--- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/src/gles2-renderer.c b/src/gles2-renderer.c index 37e9b76..d4a4fc8 100644 --- a/src/gles2-renderer.c +++ b/src/gles2-renderer.c @@ -605,6 +605,29 @@

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

2012-09-15 Thread John Kåre Alsaker
--- src/compositor.h | 6 +- src/gles2-renderer.c | 34 -- src/screenshooter.c | 27 +++ 3 files changed, 52 insertions(+), 15 deletions(-) diff --git a/src/compositor.h b/src/compositor.h index dabaf9e..1088f09 100644 ---

[PATCH 8/9] compositor: Move arrays used by wayland backend rendering into the wayland backend.

2012-09-15 Thread John Kåre Alsaker
--- src/compositor-wayland.c | 21 +++-- src/compositor.c | 1 - src/compositor.h | 1 - 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c index 71031ff..a12a90a 100644 ---

Gamma correct rendering with Wayland and Weston

2012-09-28 Thread John Kåre Alsaker
Currently most applications are blissfully unaware of the concept of gamma which affects pretty much all rendering operations. Resizing, alpha-blending, blurring, anti-aliasing, etc. are all operations that should be done on physical or linear luminance values. However if we stored linear values

Re: Gamma correct rendering with Wayland and Weston

2012-09-29 Thread John Kåre Alsaker
clients have a chance to adjust their translucent parts, even if most of them will ignore it. John Kåre Alsaker wrote: Currently most applications are blissfully unaware of the concept of gamma which affects pretty much all rendering operations

Re: Gamma correct rendering with Wayland and Weston

2012-09-29 Thread John Kåre Alsaker
On Fri, Sep 28, 2012 at 5:52 PM, John Kåre Alsaker john.kare.alsa...@gmail.com wrote: - srgb_a: Rendering in linear gamma: Shader: Undo the alpha premultiplying, convert from sRGB to linear gamma and premultiply the alpha after. When rendering srgb_a in linear gamma

[PATCH] Add a new field for compositors to store the gamma encoding of wl_buffers.

2012-09-29 Thread John Kåre Alsaker
--- src/wayland-server.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/wayland-server.h b/src/wayland-server.h index 45cc61c..f516289 100644 --- a/src/wayland-server.h +++ b/src/wayland-server.h @@ -180,6 +180,7 @@ struct wl_buffer { struct wl_resource resource; int32_t

[PATCH v2] Add a new field for compositors to store the gamma encoding of wl_buffers.

2012-09-29 Thread John Kåre Alsaker
--- src/wayland-server.h | 1 + src/wayland-shm.c| 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wayland-server.h b/src/wayland-server.h index 45cc61c..9fa754f 100644 --- a/src/wayland-server.h +++ b/src/wayland-server.h @@ -180,6 +180,7 @@ struct wl_buffer {

[PATCH weston] weston: Use float instead of GLfloat.

2012-09-29 Thread John Kåre Alsaker
--- src/compositor.c | 24 src/compositor.h | 18 +- src/matrix.c | 8 src/matrix.h | 10 +- src/shell.c | 26 +- src/util.c | 12 ++-- 6 files changed, 49 insertions(+), 49 deletions(-)

Re: [PATCH v2] Add a new field for compositors to store the gamma encoding of wl_buffers.

2012-10-01 Thread John Kåre Alsaker
ppaala...@gmail.com wrote: On Sun, 30 Sep 2012 01:39:14 +0200 John Kåre Alsaker john.kare.alsa...@gmail.com wrote: --- src/wayland-server.h | 1 + src/wayland-shm.c| 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wayland-server.h b/src/wayland-server.h index

[PATCH] tests: Remove GLfloat usage.

2012-10-03 Thread John Kåre Alsaker
--- tests/matrix-test.c | 3 +-- tests/surface-test.c | 2 +- tests/test-client.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/matrix-test.c b/tests/matrix-test.c index 8e9d13f..cc78492 100644 --- a/tests/matrix-test.c +++ b/tests/matrix-test.c @@ -22,7 +22,6 @@

[PATCH] compositor-wayland: Create border after creating the OpenGL context.

2012-10-03 Thread John Kåre Alsaker
--- src/compositor-wayland.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c index d665641..05f21c2 100644 --- a/src/compositor-wayland.c +++ b/src/compositor-wayland.c @@ -843,13 +843,14 @@ wayland_compositor_create(struct

Re: [PATCH] tests: Remove GLfloat usage.

2012-10-04 Thread John Kåre Alsaker
On Thu, Oct 4, 2012 at 8:22 AM, Pekka Paalanen ppaala...@gmail.com wrote: On Wed, 3 Oct 2012 17:30:05 +0200 John Kåre Alsaker john.kare.alsa...@gmail.com wrote: --- tests/matrix-test.c | 3 +-- tests/surface-test.c | 2 +- tests/test-client.c | 3 +-- 3 files changed, 3 insertions

[PATCH 1/2] compositor-wayland: Make sure border fields are set before wayland_compositor_create_output and document some function dependencies.

2012-10-04 Thread John Kåre Alsaker
--- src/compositor-wayland.c | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c index 05f21c2..2194010 100644 --- a/src/compositor-wayland.c +++ b/src/compositor-wayland.c @@ -237,11 +237,6 @@ create_border(struct

[PATCH 2/2] compositor-wayland: Use some nicer border sizes.

2012-10-04 Thread John Kåre Alsaker
--- src/compositor-wayland.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c index 2194010..8ddebf2 100644 --- a/src/compositor-wayland.c +++ b/src/compositor-wayland.c @@ -838,10 +838,10 @@

[krh/wayland/next 1/5] connection: Don't call memcpy with null pointer.

2012-10-12 Thread John Kåre Alsaker
--- src/connection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/connection.c b/src/connection.c index 8497670..58b150b 100644 --- a/src/connection.c +++ b/src/connection.c @@ -486,12 +486,12 @@ wl_closure_vmarshal(struct wl_object *sender,

[krh/wayland/next 2/5] scanner: Make sure arguments have names.

2012-10-12 Thread John Kåre Alsaker
--- src/scanner.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/scanner.c b/src/scanner.c index d68c952..0a6f233 100644 --- a/src/scanner.c +++ b/src/scanner.c @@ -348,6 +348,9 @@ start_element(void *data, const char *element_name, const char **atts) ctx-message =

[krh/wayland/next 3/5] connection: Removed crashing code.

2012-10-12 Thread John Kåre Alsaker
--- src/connection.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/connection.c b/src/connection.c index 58b150b..ad060b0 100644 --- a/src/connection.c +++ b/src/connection.c @@ -622,7 +622,6 @@ wl_connection_demarshal(struct wl_connection *connection, unsigned int i, count,

[krh/wayland/next 4/5] wayland-server: Make sure client object exist before dereferencing.

2012-10-12 Thread John Kåre Alsaker
--- src/wayland-server.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/wayland-server.c b/src/wayland-server.c index f076dcb..22e6a4e 100644 --- a/src/wayland-server.c +++ b/src/wayland-server.c @@ -992,7 +992,9 @@ bind_display(struct wl_client *client,

[krh/wayland/next 5/5] connection: Dereference id completely for comparasion.

2012-10-12 Thread John Kåre Alsaker
--- src/connection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/connection.c b/src/connection.c index ad060b0..6878eba 100644 --- a/src/connection.c +++ b/src/connection.c @@ -710,7 +710,7 @@ wl_connection_demarshal(struct wl_connection *connection,

[krh/weston/next 1/8] weston-launch: Check result of pam_start.

2012-10-12 Thread John Kåre Alsaker
--- src/weston-launch.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/weston-launch.c b/src/weston-launch.c index 36f9c6b..cb69968 100644 --- a/src/weston-launch.c +++ b/src/weston-launch.c @@ -157,6 +157,12 @@ setup_pam(struct weston_launch *wl) wl-pc.appdata_ptr = wl;

[krh/weston/next 2/8] Remove some dead code.

2012-10-12 Thread John Kåre Alsaker
--- clients/editor.c | 4 +--- tests/setbacklight.c | 13 +++-- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/clients/editor.c b/clients/editor.c index 02ee5da..d185137 100644 --- a/clients/editor.c +++ b/clients/editor.c @@ -232,10 +232,8 @@

[krh/weston/next 3/8] compositor-x11: Clean up event handling.

2012-10-12 Thread John Kåre Alsaker
--- src/compositor-x11.c | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/compositor-x11.c b/src/compositor-x11.c index 7ec56ff..97c6698 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -25,6 +25,7 @@ #include config.h #endif +#include

[krh/weston/next 4/8] compositor: Avoid dereferencing null pointer in clip_pointer_motion.

2012-10-12 Thread John Kåre Alsaker
--- src/compositor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compositor.c b/src/compositor.c index f96d675..e1411a4 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -1474,7 +1474,7 @@ clip_pointer_motion(struct weston_seat *seat, wl_fixed_t *fx, wl_fixed_t

[krh/weston/next 5/8] compositor: Check if surface creation failed in weston_compositor_fade.

2012-10-12 Thread John Kåre Alsaker
--- src/compositor.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/compositor.c b/src/compositor.c index e1411a4..1fb7d9f 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -1099,6 +1099,9 @@ weston_compositor_fade(struct weston_compositor *compositor, float tint) if

[krh/weston/next 6/8] compositor-x11: Check if an output is found in x11_compositor_deliver_motion_event.

2012-10-12 Thread John Kåre Alsaker
--- src/compositor-x11.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compositor-x11.c b/src/compositor-x11.c index 97c6698..5f64795 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -760,6 +760,8 @@ x11_compositor_deliver_motion_event(struct x11_compositor *c,

[krh/weston/next 7/8] compositor-x11: Fix a memory leak.

2012-10-12 Thread John Kåre Alsaker
--- src/compositor-x11.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/compositor-x11.c b/src/compositor-x11.c index 5f64795..5b2271e 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -1237,6 +1237,7 @@ output_section_done(void *data) if (output_name)

[krh/weston/next 8/8] util: Check result of weston_surface_animation_run.

2012-10-12 Thread John Kåre Alsaker
--- src/util.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util.c b/src/util.c index 4390e2e..f18281c 100644 --- a/src/util.c +++ b/src/util.c @@ -265,6 +265,9 @@ weston_slide_run(struct weston_surface *surface, float start, float stop, animation =

Re: [krh/wayland/next 1/5] connection: Don't call memcpy with null pointer.

2012-10-13 Thread John Kåre Alsaker
On Fri, Oct 12, 2012 at 3:05 PM, Rob Bradford robert.bradf...@intel.com wrote: On 12 October 2012 10:28, John Kåre Alsaker john.kare.alsa...@gmail.com wrote: - if (length 0) + if (length 0) { + memcpy(p, s, length

Re: [krh/weston/next 6/8] compositor-x11: Check if an output is found in x11_compositor_deliver_motion_event.

2012-10-16 Thread John Kåre Alsaker
On Tue, Oct 16, 2012 at 5:43 PM, Kristian Høgsberg hoegsb...@gmail.com wrote: On Fri, Oct 12, 2012 at 12:25:10PM +0200, John Kåre Alsaker wrote: --- src/compositor-x11.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compositor-x11.c b/src/compositor-x11.c index 97c6698..5f64795

Re: [krh/weston/next 4/8] compositor: Avoid dereferencing null pointer in clip_pointer_motion.

2012-10-16 Thread John Kåre Alsaker
On Tue, Oct 16, 2012 at 5:32 PM, Kristian Høgsberg hoegsb...@gmail.com wrote: On Fri, Oct 12, 2012 at 12:25:08PM +0200, John Kåre Alsaker wrote: --- src/compositor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compositor.c b/src/compositor.c index f96d675

Re: Weston under X crashes

2012-10-23 Thread John Kåre Alsaker
I also submitted a patch for this[1], although Kristian argued that it wouldn't happen in practice. It probably shouldn't trigger if nothing happened to the outputs. If just moving the cursor around triggers this, it may be a bug elsewhere. [1]

[PATCH v2] gles2-renderer: Provide an API for backends to use.

2012-10-25 Thread John Kåre Alsaker
This provides an new API for gles2-renderer. It allows to move most EGL initialization code and EGL surface creation into gles2-renderer, which makes compositor backends less dependent on gles2-renderer. As a side effect weston_output gets a per-renderer state which gles2-renderer uses to store

Re: [PATCH v2] gles2-renderer: Provide an API for backends to use.

2012-10-26 Thread John Kåre Alsaker
On Fri, Oct 26, 2012 at 8:24 AM, Pekka Paalanen ppaala...@gmail.com wrote: Hi John! since this claims to provide a new API for gles2 renderer, I will mainly comment on the API; its naming and semantics. On Thu, 25 Oct 2012 22:53:20 +0200 John Kåre Alsaker john.kare.alsa...@gmail.com wrote

Re: [PATCH v2] gles2-renderer: Provide an API for backends to use.

2012-10-26 Thread John Kåre Alsaker
On Fri, Oct 26, 2012 at 3:59 PM, Kristian Høgsberg hoegsb...@gmail.com wrote: On Thu, Oct 25, 2012 at 10:53:20PM +0200, John Kåre Alsaker wrote: This provides an new API for gles2-renderer. It allows to move most EGL initialization code and EGL surface creation into gles2-renderer, which

Re: [PATCH v2] gles2-renderer: Provide an API for backends to use.

2012-10-26 Thread John Kåre Alsaker
, Kristian Høgsberg wrote: On Fri, Oct 26, 2012 at 06:06:15PM +0200, John Kåre Alsaker wrote: On Fri, Oct 26, 2012 at 3:59 PM, Kristian Høgsberg hoegsb...@gmail.com wrote: On Thu, Oct 25, 2012 at 10:53:20PM +0200, John Kåre Alsaker wrote: This provides an new API for gles2-renderer. It allows

[PATCH v3 1/2] Move weston_output EGL state into gles2-renderer.

2012-10-27 Thread John Kåre Alsaker
--- src/compositor-android.c | 21 ++--- src/compositor-drm.c | 61 ++ src/compositor-wayland.c | 21 ++--- src/compositor-x11.c | 18 +-- src/compositor.h | 16 -- src/gles2-renderer.c | 77

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

2012-10-29 Thread John Kåre Alsaker
--- src/compositor-android.c | 128 ++-- src/compositor-drm.c | 38 ++-- src/compositor-wayland.c | 46 +++ src/compositor-x11.c | 57 ++ src/compositor.h | 9 ++- src/gles2-renderer.c | 148

[PATCH v4 03/10] Move compositor-wayland border drawing into gles2-renderer.

2012-10-29 Thread John Kåre Alsaker
--- src/compositor-wayland.c | 160 +++ src/compositor.h | 3 + src/gles2-renderer.c | 173 ++- 3 files changed, 183 insertions(+), 153 deletions(-) diff --git a/src/compositor-wayland.c

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

2012-10-29 Thread John Kåre Alsaker
--- src/compositor.h | 6 - src/gles2-renderer.c | 67 +++- src/screenshooter.c | 27 +++-- 3 files changed, 76 insertions(+), 24 deletions(-) diff --git a/src/compositor.h b/src/compositor.h index 48bbbc6..dfad011 100644

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

2012-10-29 Thread John Kåre Alsaker
--- src/compositor.h | 12 --- src/gles2-renderer.c | 61 ++-- 2 files changed, 35 insertions(+), 38 deletions(-) diff --git a/src/compositor.h b/src/compositor.h index 76f9aa8..1f6a38f 100644 --- a/src/compositor.h +++

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

2012-10-29 Thread John Kåre Alsaker
weston_compositor * backend_init(struct wl_display *display, int argc, char *argv[], const char *config_file); diff --git a/src/gl-renderer.h b/src/gl-renderer.h new file mode 100644 index 000..f161423 --- /dev/null +++ b/src/gl-renderer.h @@ -0,0 +1,48 @@ +/* + * Copyright © 2012 John Kåre Alsaker

[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 +--

[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 ++-

[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

[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

[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

[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 @@

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

[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 +++

[PATCH v6 01/12] Move weston_output EGL state into gles2-renderer.

2012-11-13 Thread John Kåre Alsaker
This introduces callbacks for output creation and destruction for the gles2-renderer. This enables the gles2-renderer to have per-output state. EGL surface creation is now done by the output_create callback and the EGL surface is stored in the new per-output gles2-renderer state. On the first

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

2012-11-13 Thread John Kåre Alsaker
This moves the EGLConfig, EGLContext and EGLDisplay fields into gles2-renderer. It also moves EGLDisplay creation and EGLConfig selection into gles2-renderer. --- src/compositor-android.c | 150 +++ src/compositor-drm.c | 39 ++--- src/compositor-rpi.c

[PATCH v6 04/12] compositor: Add a renderer function to read out pixels

2012-11-13 Thread John Kåre Alsaker
--- src/compositor.h | 4 src/gles2-renderer.c | 63 src/noop-renderer.c | 10 + 3 files changed, 68 insertions(+), 9 deletions(-) diff --git a/src/compositor.h b/src/compositor.h index e4ba19c..e2dbd0d 100644 ---

[PATCH v6 05/12] screenshooter: Use the renderer function for reading out pixels

2012-11-13 Thread John Kåre Alsaker
This also changes the compositor's read_format to a pixman format. --- src/compositor.h | 2 +- src/gles2-renderer.c | 4 ++-- src/screenshooter.c | 27 +++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/compositor.h b/src/compositor.h index

[PATCH v6 07/12] gles2-renderer: Renaming some functions.

2012-11-13 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 a02cdac..20a34b3 100644 --- a/src/gles2-renderer.c +++ b/src/gles2-renderer.c @@ -642,7 +642,7 @@

[PATCH v6 09/12] Move weston_surface GL and EGL state into gles2-renderer.

2012-11-13 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 ---

[PATCH v6 10/12] Move weston_compositor GL and EGL state into gles2-renderer.

2012-11-13 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 a398a74..2f701c5 100644 --- a/src/compositor.h +++

[PATCH v6 12/12] Rename gles2-renderer to gl-renderer.

2012-11-13 Thread John Kåre Alsaker
--- src/compositor-android.c | 18 ++--- src/compositor-drm.c | 20 +++--- src/compositor-rpi.c | 24 +++ src/compositor-wayland.c | 22 +++--- src/compositor-x11.c | 14 ++-- src/gl-renderer.h| 18 ++--- src/gles2-renderer.c | 171

[RFC weston 0/2] Adding a more flexible shader generation

2012-11-14 Thread John Kåre Alsaker
to rewrite all of gl-shaders.c anyway with only 2 functions being recognisable. So I was wondering if I should just merge these patches. The first commit which really utilizes this is the one which adds gamma correct rendering. Should I wait until cleaning up that before submitting this? John Kåre

Re: [RFC weston 0/2] Adding a more flexible shader generation

2012-11-15 Thread John Kåre Alsaker
On Thu, Nov 15, 2012 at 11:01 AM, Ander Conselvan de Oliveira conselv...@gmail.com wrote: On 11/14/2012 05:41 PM, John Kåre Alsaker wrote: These two patches adds a flexible shader generation which is based on concatenating strings instead of duplicating them into a lot of literals

[RFCv2 0/9] Adding gamma correct compositing

2012-11-16 Thread John Kåre Alsaker
*** John Kåre Alsaker (9): gl-renderer: Move shader functions into it's own file. gl-renderer: Add flexible shader generation. gl-renderer: Add optional support for desktop OpenGL. gl-renderer: Tweak YUV shader. gl-renderer: Adds the ability to draw damage to a texture and in turn

[RFCv2 1/9] gl-renderer: Move shader functions into it's own file.

2012-11-16 Thread John Kåre Alsaker
..90912df --- /dev/null +++ b/src/gl-internal.h @@ -0,0 +1,138 @@ +/* + * Copyright © 2012 Intel Corporation + * Copyright © 2012 John Kåre Alsaker + * + * Permission to use, copy, modify, distribute, and sell this software and + * its documentation for any purpose is hereby granted without fee

[RFCv2 3/9] gl-renderer: Add optional support for desktop OpenGL.

2012-11-16 Thread John Kåre Alsaker
This adds support for desktop OpenGL which can be enabled by with ./configure --enable-opengl. Most of the differences in API between OpenGL and OpenGL ES is hidden by the new gl_renderer fields. It also accesses GLES2 extensions by including GLES2/gl2platform.h directly. --- configure.ac

[RFCv2 4/9] gl-renderer: Tweak YUV shader.

2012-11-16 Thread John Kåre Alsaker
A more vectorized version of the YUV shader, may or may not be faster. It's also untested... --- src/gl-shaders.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/gl-shaders.c b/src/gl-shaders.c index 32bb70d..8595daf 100644 --- a/src/gl-shaders.c +++

[RFCv2 5/9] gl-renderer: Adds the ability to draw damage to a texture and in turn to the framebuffer.

2012-11-16 Thread John Kåre Alsaker
--- src/gl-internal.h | 5 ++ src/gl-renderer.c | 170 -- 2 files changed, 158 insertions(+), 17 deletions(-) diff --git a/src/gl-internal.h b/src/gl-internal.h index 83b351f..40f109b 100644 --- a/src/gl-internal.h +++ b/src/gl-internal.h @@

[RFCv2 7/9] gl-renderer: Don't multiply with alpha uniform when it's 1.0.

2012-11-16 Thread John Kåre Alsaker
This eliminates the multiplication of the alpha uniform for the common case of surfaces with 1.0 as alpha. --- src/gl-internal.h | 1 + src/gl-renderer.c | 14 -- src/gl-shaders.c | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/gl-internal.h

[RFCv2 8/9] gl-renderer: Remove unneeded glActiveTexture call.

2012-11-16 Thread John Kåre Alsaker
--- src/gl-renderer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gl-renderer.c b/src/gl-renderer.c index 5847e12..c82bed8 100644 --- a/src/gl-renderer.c +++ b/src/gl-renderer.c @@ -1725,8 +1725,6 @@ gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface)

[RFCv2 9/9] gl-renderer: Clean up EGL image and GL texture destruction.

2012-11-16 Thread John Kåre Alsaker
This also ensures we destroy all EGL images if a plane fails to be created. --- src/gl-renderer.c | 43 +++ 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/src/gl-renderer.c b/src/gl-renderer.c index c82bed8..b022ba6 100644 ---

Re: [RFCv2 6/9] gl-renderer: Add support for blending in linear space.

2012-11-19 Thread John Kåre Alsaker
On Mon, Nov 19, 2012 at 9:52 AM, Pekka Paalanen ppaala...@gmail.com wrote: On Sat, 17 Nov 2012 03:23:57 +0100 John Kåre Alsaker john.kare.alsa...@gmail.com wrote: This makes compositing gamma correct by assuming all input surfaces are in the sRGB color space. It can be enabled by setting

Re: [RFCv2 3/9] gl-renderer: Add optional support for desktop OpenGL.

2012-11-19 Thread John Kåre Alsaker
On Mon, Nov 19, 2012 at 9:46 AM, Pekka Paalanen ppaala...@gmail.com wrote: On Sat, 17 Nov 2012 03:23:54 +0100 John Kåre Alsaker john.kare.alsa...@gmail.com wrote: This adds support for desktop OpenGL which can be enabled by with ./configure --enable-opengl. Most of the differences in API

Re: [RFCv2 3/9] gl-renderer: Add optional support for desktop OpenGL.

2012-11-19 Thread John Kåre Alsaker
On Mon, Nov 19, 2012 at 9:21 AM, Pekka Paalanen ppaala...@gmail.com wrote: On Sat, 17 Nov 2012 03:23:54 +0100 John Kåre Alsaker john.kare.alsa...@gmail.com wrote: This adds support for desktop OpenGL which can be enabled by with ./configure --enable-opengl. Most of the differences in API

Re: Problems with the newest wayland git

2012-11-19 Thread John Kåre Alsaker
On Mon, Nov 19, 2012 at 8:32 PM, Bill Spitzak spit...@gmail.com wrote: Can somebody explain why compiling weston with the switch --with-cairo-glesv2 would perhaps fix the weston clients (I am not at my machine to try this so I don't know if it does). Doesn't that switch *make* it use EGL

Re: Problems with the newest wayland git

2012-11-19 Thread John Kåre Alsaker
On Mon, Nov 19, 2012 at 9:05 PM, Bill Spitzak spit...@gmail.com wrote: John Kåre Alsaker wrote: On Mon, Nov 19, 2012 at 8:32 PM, Bill Spitzak spit...@gmail.com wrote: Can somebody explain why compiling weston with the switch --with-cairo-glesv2 would perhaps fix the weston clients (I am

Re: Sub-surface protocol

2012-12-13 Thread John Kåre Alsaker
Here is my subsurface proposal. I don't like video sinks (or other things) running on an independent framerate. I don't want to maintain more state in the compositor side for them or have increased complexity in the protocol. They are inefficient and can be solved by a number of other ways. In

Re: Sub-surface protocol

2012-12-13 Thread John Kåre Alsaker
, set_position and commit_surface requests atomically. /description /request /interface On Thu, Dec 13, 2012 at 3:30 PM, Pekka Paalanen ppaala...@gmail.com wrote: Hi John, On Thu, 13 Dec 2012 14:51:17 +0100 John Kåre Alsaker john.kare.alsa...@gmail.com wrote: Here is my

Re: Sub-surface protocol

2012-12-13 Thread John Kåre Alsaker
On Thu, Dec 13, 2012 at 11:47 PM, Bill Spitzak spit...@gmail.com wrote: I see no reason for extra objects. What I would do is add a parent to the normal surface. If it is NULL then it is a main surface. If it points at another surface then it is a subsurface or a floating window. The parent

Re: Sub-surface protocol

2012-12-17 Thread John Kåre Alsaker
On Mon, Dec 17, 2012 at 11:40 PM, Bill Spitzak spit...@gmail.com wrote: That brings up an interesting possibility: can a subsurface (or any surface) image be a subrectangle of an image used for another surface? I'm thinking this would be possible, provided the client can tell the wayland server

Re: Sub-surface protocol

2012-12-18 Thread John Kåre Alsaker
On Tue, Dec 18, 2012 at 6:40 AM, Bill Spitzak spit...@gmail.com wrote: On Dec 17, 2012, at 5:01 PM, John Kåre Alsaker wrote: Then a client such as gimp could draw all it's display into a single buffer. To get the different color correction of the center display, it would declare

Re: Sub-surface protocol

2012-12-18 Thread John Kåre Alsaker
On Tue, Dec 18, 2012 at 2:59 PM, John Kåre Alsaker john.kare.alsa...@gmail.com wrote: On Tue, Dec 18, 2012 at 6:40 AM, Bill Spitzak spit...@gmail.com wrote: On Dec 17, 2012, at 5:01 PM, John Kåre Alsaker wrote: Then a client such as gimp could draw all it's display into a single buffer

Re: Sub-surface protocol

2012-12-18 Thread John Kåre Alsaker
On Tue, Dec 18, 2012 at 10:29 AM, Pekka Paalanen ppaala...@gmail.com wrote: On Mon, 17 Dec 2012 15:47:43 + Richard Hughes hughsi...@gmail.com wrote: On 5 December 2012 14:32, Pekka Paalanen ppaala...@gmail.com wrote: One of the most important use cases is a video player in a window. It

Re: [RFC] Sub-surface protocol and implementation v1

2013-01-07 Thread John Kåre Alsaker
On Fri, Dec 21, 2012 at 12:56 PM, Pekka Paalanen ppaala...@gmail.com wrote: Hi all, we started a discussion about sub-surfaces in Wayland in [1]. Based on that, and with heavy limiting of scope, I present my first sub-surface draft:

Re: [PATCH v2 2/2] x11 backend: add option to use pixman renderer

2013-01-07 Thread John Kåre Alsaker
The use-shm variable (which I assume stand for use-x11-shm) and configuration option should probably be renamed to use-pixman so it could be used with multiple backends and not be easily confused with wl_shm. On Mon, Jan 7, 2013 at 7:49 PM, Kristian Høgsberg hoegsb...@gmail.com wrote: On Mon,

  1   2   >